<!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>[169399] 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/169399">169399</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-05-27 14:14:20 -0700 (Tue, 27 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Caret's screen position does not update during an overflow scroll
https://bugs.webkit.org/show_bug.cgi?id=133256
Reviewed by Simon Fraser.
Source/WebCore:
During a scroll, we set a flag which caret position is gated on, but we never
actually invalidate the caret's position. This patch does so.
Test: editing/input/caret-position-during-scroll.html
* editing/FrameSelection.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollTo):
LayoutTests:
This test places the caret, inspects its position, scrolls, and then immediately inspects its
position again. The two positions should be different.
* editing/input/caret-position-during-scroll-expected.txt: Added.
* editing/input/caret-position-during-scroll.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="#trunkSourceWebCoreeditingFrameSelectionh">trunk/Source/WebCore/editing/FrameSelection.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditinginputcaretpositionduringscrollexpectedtxt">trunk/LayoutTests/editing/input/caret-position-during-scroll-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditinginputcaretpositionduringscrollhtml">trunk/LayoutTests/editing/input/caret-position-during-scroll.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169398 => 169399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-27 20:45:21 UTC (rev 169398)
+++ trunk/LayoutTests/ChangeLog 2014-05-27 21:14:20 UTC (rev 169399)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-23 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Caret's screen position does not update during an overflow scroll
+ https://bugs.webkit.org/show_bug.cgi?id=133256
+
+ Reviewed by Simon Fraser.
+
+ This test places the caret, inspects its position, scrolls, and then immediately inspects its
+ position again. The two positions should be different.
+
+ * editing/input/caret-position-during-scroll-expected.txt: Added.
+ * editing/input/caret-position-during-scroll.html: Added.
+
</ins><span class="cx"> 2014-05-27 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Audio volume scrubber does not show volume level thumb
</span></span></pre></div>
<a id="trunkLayoutTestseditinginputcaretpositionduringscrollexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/input/caret-position-during-scroll-expected.txt (0 => 169399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/input/caret-position-during-scroll-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/input/caret-position-during-scroll-expected.txt 2014-05-27 21:14:20 UTC (rev 169399)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+This test places the caret, inspects its position, scrolls, and immediately inspects the caret's position again. The two positions should be different. If this test passes, "Result: Pass" will be printed below the list of numbers.
+Scrolling with the mouse does not cause the caret's screen position to be recomputed
+00
+01
+02
+03
+04
+05
+06
+07
+08
+09
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+Result: PASS
</ins></span></pre></div>
<a id="trunkLayoutTestseditinginputcaretpositionduringscrollhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/input/caret-position-during-scroll.html (0 => 169399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/input/caret-position-during-scroll.html (rev 0)
+++ trunk/LayoutTests/editing/input/caret-position-during-scroll.html 2014-05-27 21:14:20 UTC (rev 169399)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<!DOCTYPE html>
+<head>
+<script type="text/javascript" src="resources/reveal-utilities.js"></script>
+</head>
+<body>
+<div>This test places the caret, inspects its position, scrolls, and immediately inspects the caret's position again.
+The two positions should be different. If this test passes, "Result: Pass" will be printed below the list of numbers.</div>
+<div>Scrolling with the mouse does not cause the caret's screen position to be recomputed</div>
+<span style="position:absolute; visibility:hidden" id="single-digit">0</span>
+<div style="border:thin solid black; overflow:scroll" contenteditable="true" id="input-contenteditable"></div>
+Result: <span id="console"></div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+var contentEditable = document.getElementById("input-contenteditable");
+contentEditable.innerHTML = generateNumbers(0, 30, 2, "<br>");
+var singleDigitHeight = document.getElementById("single-digit").clientHeight;
+var contentEditableSize = 10;
+contentEditable.style.height = (singleDigitHeight * contentEditableSize) + "px";
+contentEditable.focus();
+var child = contentEditable.firstChild;
+for (var i = 0; i < 36; ++i)
+ child = child.nextSibling;
+getSelection().collapse(child, 0);
+var before;
+if (window.internals)
+ before = internals.absoluteCaretBounds(document).top;
+if (window.eventSender) {
+ var input = document.getElementById('input-contenteditable');
+ var x = contentEditable.offsetLeft + contentEditable.offsetWidth / 2;
+ var y = contentEditable.offsetTop + contentEditable.offsetHeight / 2;
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseScrollBy(0, -50);
+}
+var after;
+if (window.internals)
+ after = internals.absoluteCaretBounds(document).top;
+var result = "FAIL";
+if (before != after)
+ result = "PASS";
+document.getElementById("console").textContent = result;
+</script>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169398 => 169399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-27 20:45:21 UTC (rev 169398)
+++ trunk/Source/WebCore/ChangeLog 2014-05-27 21:14:20 UTC (rev 169399)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-05-23 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Caret's screen position does not update during an overflow scroll
+ https://bugs.webkit.org/show_bug.cgi?id=133256
+
+ Reviewed by Simon Fraser.
+
+ During a scroll, we set a flag which caret position is gated on, but we never
+ actually invalidate the caret's position. This patch does so.
+
+ Test: editing/input/caret-position-during-scroll.html
+
+ * editing/FrameSelection.h:
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollTo):
+
</ins><span class="cx"> 2014-05-27 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Turn on the LayerPool for iOS
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.h (169398 => 169399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.h 2014-05-27 20:45:21 UTC (rev 169398)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2014-05-27 21:14:20 UTC (rev 169399)
</span><span class="lines">@@ -269,6 +269,8 @@
</span><span class="cx"> bool shouldShowBlockCursor() const { return m_shouldShowBlockCursor; }
</span><span class="cx"> void setShouldShowBlockCursor(bool);
</span><span class="cx">
</span><ins>+ void invalidateCaretRect();
+
</ins><span class="cx"> private:
</span><span class="cx"> enum EPositionType { START, END, BASE, EXTENT };
</span><span class="cx">
</span><span class="lines">@@ -311,7 +313,6 @@
</span><span class="cx">
</span><span class="cx"> void setCaretVisibility(CaretVisibility);
</span><span class="cx"> bool recomputeCaretRect();
</span><del>- void invalidateCaretRect();
</del><span class="cx">
</span><span class="cx"> bool dispatchSelectStart();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (169398 => 169399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-05-27 20:45:21 UTC (rev 169398)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-05-27 21:14:20 UTC (rev 169399)
</span><span class="lines">@@ -2294,7 +2294,7 @@
</span><span class="cx"> Frame& frame = renderer().frame();
</span><span class="cx"> RenderLayerModelObject* repaintContainer = renderer().containerForRepaint();
</span><span class="cx"> // The caret rect needs to be invalidated after scrolling
</span><del>- frame.selection().setCaretRectNeedsUpdate();
</del><ins>+ frame.selection().invalidateCaretRect();
</ins><span class="cx">
</span><span class="cx"> FloatQuad quadForFakeMouseMoveEvent = FloatQuad(m_repaintRect);
</span><span class="cx"> if (repaintContainer)
</span></span></pre>
</div>
</div>
</body>
</html>