<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167845] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167845">167845</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-04-26 14:28:20 -0700 (Sat, 26 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/164133">r164133</a>): Selection doesn't paint when scrolling some pages
https://bugs.webkit.org/show_bug.cgi?id=132172
Source/WebCore:
rdar://problem/16719473
Reviewed by Brent Fulgham.
Tests: fast/dynamic/remove-invisible-node-inside-selection.html
fast/dynamic/remove-node-inside-selection.html
* editing/FrameSelection.cpp:
(WebCore::clearRenderViewSelection): Changed to take a Node& because having
this take a Position& was unnecessary and strange, when really it just needs
to take a document as an argument.
(WebCore::DragCaretController::nodeWillBeRemoved): Updated for the above.
(WebCore::FrameSelection::respondToNodeModification): Added code to set the
m_pendingSelectionUpdate flag and call RenderView::setNeedsLayout so the
selection will be recomputed after it's temporarily cleared when one of
the selected nodes is removed.
LayoutTests:
Reviewed by Brent Fulgham.
* fast/dynamic/remove-invisible-node-inside-selection-expected.html: Added.
* fast/dynamic/remove-invisible-node-inside-selection.html: Added.
* fast/dynamic/remove-node-inside-selection-expected.html: Added.
* fast/dynamic/remove-node-inside-selection.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdynamicremoveinvisiblenodeinsideselectionexpectedhtml">trunk/LayoutTests/fast/dynamic/remove-invisible-node-inside-selection-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastdynamicremoveinvisiblenodeinsideselectionhtml">trunk/LayoutTests/fast/dynamic/remove-invisible-node-inside-selection.html</a></li>
<li><a href="#trunkLayoutTestsfastdynamicremovenodeinsideselectionexpectedhtml">trunk/LayoutTests/fast/dynamic/remove-node-inside-selection-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastdynamicremovenodeinsideselectionhtml">trunk/LayoutTests/fast/dynamic/remove-node-inside-selection.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167844 => 167845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-26 19:15:40 UTC (rev 167844)
+++ trunk/LayoutTests/ChangeLog 2014-04-26 21:28:20 UTC (rev 167845)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-04-24 Darin Adler <darin@apple.com>
+
+ REGRESSION (r164133): Selection doesn't paint when scrolling some pages
+ https://bugs.webkit.org/show_bug.cgi?id=132172
+
+ Reviewed by Brent Fulgham.
+
+ * fast/dynamic/remove-invisible-node-inside-selection-expected.html: Added.
+ * fast/dynamic/remove-invisible-node-inside-selection.html: Added.
+ * fast/dynamic/remove-node-inside-selection-expected.html: Added.
+ * fast/dynamic/remove-node-inside-selection.html: Added.
+
</ins><span class="cx"> 2014-04-25 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r167689): Hovering file name in a file input causes a crash
</span></span></pre></div>
<a id="trunkLayoutTestsfastdynamicremoveinvisiblenodeinsideselectionexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dynamic/remove-invisible-node-inside-selection-expected.html (0 => 167845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dynamic/remove-invisible-node-inside-selection-expected.html (rev 0)
+++ trunk/LayoutTests/fast/dynamic/remove-invisible-node-inside-selection-expected.html 2014-04-26 21:28:20 UTC (rev 167845)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+<p id="paragraph">This test checks to see if removing a word causes the painted color of a selection to disappear. There is an extra word that is removed and the test passes if everything looks selected as it should.</p>
+<script>
+ var paragraph = document.getElementById("paragraph");
+ getSelection().setBaseAndExtent(paragraph, 0, paragraph, paragraph.childNodes.length);
+</script>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/dynamic/remove-invisible-node-inside-selection-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastdynamicremoveinvisiblenodeinsideselectionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dynamic/remove-invisible-node-inside-selection.html (0 => 167845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dynamic/remove-invisible-node-inside-selection.html (rev 0)
+++ trunk/LayoutTests/fast/dynamic/remove-invisible-node-inside-selection.html 2014-04-26 21:28:20 UTC (rev 167845)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<p id="paragraph">This test checks to see if removing a word causes the painted color of a selection to disappear. There is an extra word <b id="word" style="display:none">word </b>that is removed and the test passes if everything looks selected as it should.</p>
+<script>
+ var paragraph = document.getElementById("paragraph");
+ getSelection().setBaseAndExtent(paragraph, 0, paragraph, paragraph.childNodes.length);
+ paragraph.removeChild(document.getElementById("word"));
+</script>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/dynamic/remove-invisible-node-inside-selection.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastdynamicremovenodeinsideselectionexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dynamic/remove-node-inside-selection-expected.html (0 => 167845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dynamic/remove-node-inside-selection-expected.html (rev 0)
+++ trunk/LayoutTests/fast/dynamic/remove-node-inside-selection-expected.html 2014-04-26 21:28:20 UTC (rev 167845)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+<p id="paragraph">This test checks to see if removing a word causes the painted color of a selection to disappear. There is an extra word that is removed and the test passes if everything looks selected as it should.</p>
+<script>
+ var paragraph = document.getElementById("paragraph");
+ getSelection().setBaseAndExtent(paragraph, 0, paragraph, paragraph.childNodes.length);
+</script>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/dynamic/remove-node-inside-selection-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastdynamicremovenodeinsideselectionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dynamic/remove-node-inside-selection.html (0 => 167845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dynamic/remove-node-inside-selection.html (rev 0)
+++ trunk/LayoutTests/fast/dynamic/remove-node-inside-selection.html 2014-04-26 21:28:20 UTC (rev 167845)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<p id="paragraph">This test checks to see if removing a word causes the painted color of a selection to disappear. There is an extra word <b id="word">word </b>that is removed and the test passes if everything looks selected as it should.</p>
+<script>
+ var paragraph = document.getElementById("paragraph");
+ getSelection().setBaseAndExtent(paragraph, 0, paragraph, paragraph.childNodes.length);
+ paragraph.removeChild(document.getElementById("word"));
+</script>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/dynamic/remove-node-inside-selection.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167844 => 167845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-26 19:15:40 UTC (rev 167844)
+++ trunk/Source/WebCore/ChangeLog 2014-04-26 21:28:20 UTC (rev 167845)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-04-24 Darin Adler <darin@apple.com>
+
+ REGRESSION (r164133): Selection doesn't paint when scrolling some pages
+ https://bugs.webkit.org/show_bug.cgi?id=132172
+ rdar://problem/16719473
+
+ Reviewed by Brent Fulgham.
+
+ Tests: fast/dynamic/remove-invisible-node-inside-selection.html
+ fast/dynamic/remove-node-inside-selection.html
+
+ * editing/FrameSelection.cpp:
+ (WebCore::clearRenderViewSelection): Changed to take a Node& because having
+ this take a Position& was unnecessary and strange, when really it just needs
+ to take a document as an argument.
+ (WebCore::DragCaretController::nodeWillBeRemoved): Updated for the above.
+ (WebCore::FrameSelection::respondToNodeModification): Added code to set the
+ m_pendingSelectionUpdate flag and call RenderView::setNeedsLayout so the
+ selection will be recomputed after it's temporarily cleared when one of
+ the selected nodes is removed.
+
</ins><span class="cx"> 2014-04-25 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r167689): Hovering file name in a file input causes a crash
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (167844 => 167845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp 2014-04-26 19:15:40 UTC (rev 167844)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2014-04-26 21:28:20 UTC (rev 167845)
</span><span class="lines">@@ -390,9 +390,9 @@
</span><span class="cx"> return element->containsIncludingShadowDOM(position.anchorNode());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void clearRenderViewSelection(const Position& position)
</del><ins>+static void clearRenderViewSelection(Node& node)
</ins><span class="cx"> {
</span><del>- Ref<Document> document(position.anchorNode()->document());
</del><ins>+ Ref<Document> document(node.document());
</ins><span class="cx"> document->updateStyleIfNeeded();
</span><span class="cx"> if (RenderView* view = document->renderView())
</span><span class="cx"> view->clearSelection();
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx"> if (!removingNodeRemovesPosition(node, m_position.deepEquivalent()))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- clearRenderViewSelection(m_position.deepEquivalent());
</del><ins>+ clearRenderViewSelection(*node);
</ins><span class="cx"> clear();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -464,9 +464,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (clearRenderTreeSelection)
- clearRenderViewSelection(m_selection.start());
</del><ins>+ if (clearRenderTreeSelection) {
+ clearRenderViewSelection(*node);
</ins><span class="cx">
</span><ins>+ // Trigger a selection update so the selection will be set again.
+ if (auto* renderView = node->document().renderView()) {
+ m_pendingSelectionUpdate = true;
+ renderView->setNeedsLayout();
+ }
+ }
+
</ins><span class="cx"> if (clearDOMTreeSelection)
</span><span class="cx"> setSelection(VisibleSelection(), DoNotSetFocus);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>