<!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>[190423] 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/190423">190423</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-10-01 12:31:22 -0700 (Thu, 01 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Latch does not clear when a scroll snap animation is triggered
https://bugs.webkit.org/show_bug.cgi?id=149681
<rdar://problem/22733922>
Reviewed by Simon Fraser.
Source/WebCore:
Test: tiled-drawing/scrolling/latched-div-with-scroll-snap.html
The scroll snap animation logic bypasses some of the normal clean-up code used
for wheel event handling. When this happens, the scroll latching state is not
cleared. In some cases this "stale" latch state is used when starting a new
gesture in the same frame. This causes the wrong page element to receive the
mouse wheel events, and hilarity ensues.
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::platformNotifyIfEndGesture): Clear latched state when
ending the gesture.
LayoutTests:
Add a new test that confirms latched state is cleared when scroll snap animations
are triggered.
* tiled-drawing/scrolling/latched-div-with-scroll-snap-expected.txt: Added.
* tiled-drawing/scrolling/latched-div-with-scroll-snap.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="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTeststileddrawingscrollinglatcheddivwithscrollsnapexpectedtxt">trunk/LayoutTests/tiled-drawing/scrolling/latched-div-with-scroll-snap-expected.txt</a></li>
<li><a href="#trunkLayoutTeststileddrawingscrollinglatcheddivwithscrollsnaphtml">trunk/LayoutTests/tiled-drawing/scrolling/latched-div-with-scroll-snap.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190422 => 190423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-01 19:12:51 UTC (rev 190422)
+++ trunk/LayoutTests/ChangeLog 2015-10-01 19:31:22 UTC (rev 190423)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-10-01 Brent Fulgham <bfulgham@apple.com>
+
+ Latch does not clear when a scroll snap animation is triggered
+ https://bugs.webkit.org/show_bug.cgi?id=149681
+ <rdar://problem/22733922>
+
+ Reviewed by Simon Fraser.
+
+ Add a new test that confirms latched state is cleared when scroll snap animations
+ are triggered.
+
+ * tiled-drawing/scrolling/latched-div-with-scroll-snap-expected.txt: Added.
+ * tiled-drawing/scrolling/latched-div-with-scroll-snap.html: Added.
+
</ins><span class="cx"> 2015-10-01 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove some tests that now pass.
</span></span></pre></div>
<a id="trunkLayoutTeststileddrawingscrollinglatcheddivwithscrollsnapexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/tiled-drawing/scrolling/latched-div-with-scroll-snap-expected.txt (0 => 190423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/tiled-drawing/scrolling/latched-div-with-scroll-snap-expected.txt (rev 0)
+++ trunk/LayoutTests/tiled-drawing/scrolling/latched-div-with-scroll-snap-expected.txt 2015-10-01 19:31:22 UTC (rev 190423)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Tests that the scroll-snap feature works properly in overflow regions.
+PASS div scrolled to next window.
+PASS div honored snap points.
+Testing that latch moves to bottom div:
+PASS top div did not move.
+PASS div scrolled to next window.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTeststileddrawingscrollinglatcheddivwithscrollsnaphtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/tiled-drawing/scrolling/latched-div-with-scroll-snap.html (0 => 190423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/tiled-drawing/scrolling/latched-div-with-scroll-snap.html (rev 0)
+++ trunk/LayoutTests/tiled-drawing/scrolling/latched-div-with-scroll-snap.html 2015-10-01 19:31:22 UTC (rev 190423)
</span><span class="lines">@@ -0,0 +1,227 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ .gallery {
+ width: 200px;
+ height: 200px;
+ overflow-y: hidden;
+ overflow-x: auto;
+ margin-bottom: 2px;
+ -webkit-scroll-snap-points-x: repeat(100%);
+ -webkit-scroll-snap-type: mandatory;
+ }
+ .galleryDrawer {
+ width: 1200px;
+ height: 200px;
+ }
+ .colorBox {
+ height: 200px;
+ width: 200px;
+ float: left;
+ }
+ #itemH0, #itemV0 { background-color: red; }
+ #itemH1, #itemV1 { background-color: green; }
+ #itemH2, #itemV2 { background-color: blue; }
+ #itemH3, #itemV3 { background-color: aqua; }
+ #itemH4, #itemV4 { background-color: yellow; }
+ #itemH5, #itemV5 { background-color: fuchsia; }
+ </style>
+ <script src="../../resources/js-test.js"></script>
+ <script>
+ window.jsTestIsAsync = true;
+
+ var divScrollPositionBeforeGlide;
+ var divScrollPositionBeforeSnap;
+ var divScrollPositionBeforeSecondaryMove;
+ var bottomDivScrollPositionBeforeSecondaryMove;
+
+ function locationInWindowCoordinates(element)
+ {
+ var position = {};
+ position.x = element.offsetLeft;
+ position.y = element.offsetTop;
+
+ while (element.offsetParent) {
+ position.x = position.x + element.offsetParent.offsetLeft;
+ position.y = position.y + element.offsetParent.offsetTop;
+ if (element == document.getElementsByTagName("body")[0])
+ break;
+
+ element = element.offsetParent;
+ }
+
+ return position;
+ }
+
+
+ function checkForSecondaryScrollGlide(targetLabel)
+ {
+ var topDivTarget = document.getElementById("topTarget");
+
+ var actualTopPosition = topDivTarget.scrollLeft;
+ var expectedTopPosition = divScrollPositionBeforeSecondaryMove;
+
+ // The top div should NOT have scrolled (glided) to the next snap point.
+ if (actualTopPosition == expectedTopPosition)
+ testPassed("top div did not move.");
+ else
+ testFailed("top div was improperly latched. Expected " + expectedTopPosition + ", but got " + actualTopPosition);
+
+ var divTarget = document.getElementById("bottomTarget");
+
+ var actualPosition = divTarget.scrollLeft;
+ var expectedPosition = divTarget.clientWidth;
+
+ // The div should have scrolled (glided) to the next snap point.
+ if (actualPosition == expectedPosition)
+ testPassed("div scrolled to next window.");
+ else
+ testFailed("div did not honor snap points. Expected " + expectedPosition + ", but got " + actualPosition);
+
+ finishJSTest();
+ }
+
+ function performSwipeGestureOnElement(divTarget)
+ {
+ var windowPosition = locationInWindowCoordinates(divTarget);
+ var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth;
+ var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight;
+
+ eventSender.mouseMoveTo(startPosX, startPosY);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'began', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'none', 'begin');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'none', 'continue');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
+ }
+
+ function scrollInSecondDiv()
+ {
+ debug("Testing that latch moves to bottom div:");
+ var topDivTarget = document.getElementById("topTarget");
+ divScrollPositionBeforeSecondaryMove = topDivTarget.scrollLeft;
+
+ var divTarget = document.getElementById("bottomTarget");
+
+ performSwipeGestureOnElement(divTarget);
+
+ eventSender.callAfterScrollingCompletes(function() { return checkForSecondaryScrollGlide(); });
+ }
+
+ function checkForScrollSnap()
+ {
+ var divTarget = document.getElementById("topTarget");
+
+ var actualPosition = divTarget.scrollLeft;
+
+ // The div should have snapped back to the previous position
+ if (actualPosition != divScrollPositionBeforeSnap)
+ testFailed("div did not snap back to proper location for " + targetLabel +". Expected " + divScrollPositionBeforeSnap + ", but got " + actualPosition);
+ else
+ testPassed("div honored snap points.");
+
+ setTimeout(function() { scrollInSecondDiv() }, 0);
+ }
+
+ function scrollSnapTest()
+ {
+ var divTarget = document.getElementById("topTarget");
+
+ divScrollPositionBeforeSnap = divTarget.scrollLeft;
+
+ var windowPosition = locationInWindowCoordinates(divTarget);
+ var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth;
+ var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight;
+
+ eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'began', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none');
+ eventSender.callAfterScrollingCompletes(function() { return checkForScrollSnap(); });
+ }
+
+ function checkForScrollGlide(targetLabel)
+ {
+ var divTarget = document.getElementById("topTarget");
+
+ var actualPosition = divTarget.scrollLeft;
+ var expectedPosition = divTarget.clientWidth;
+
+ // The div should have scrolled (glided) to the next snap point.
+ if (actualPosition == expectedPosition)
+ testPassed("div scrolled to next window.");
+ else
+ testFailed("div did not honor snap points. Expected " + expectedPosition + ", but got " + actualPosition);
+
+ setTimeout(function() { scrollSnapTest() }, 0);
+ }
+
+ function scrollGlideTest()
+ {
+ var divTarget = document.getElementById("topTarget");
+
+ divScrollPositionBeforeGlide = divTarget.scrollLeft;
+
+ performSwipeGestureOnElement(divTarget);
+
+ eventSender.callAfterScrollingCompletes(function() { return checkForScrollGlide(); });
+ }
+
+ function onLoad()
+ {
+ if (window.eventSender) {
+ eventSender.monitorWheelEvents();
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ setTimeout(function() { scrollGlideTest() }, 0);
+ } else {
+ var messageLocationH = document.getElementById('itemH0');
+ var message = document.createElement('div');
+ message.innerHTML = "<p>This test is better run under WebKitTestRunner.<br/>To manually test it, place the mouse pointer<br/>"
+ + "inside the red region at the top of the page,<br/>and then use the mouse wheel or a two-finger<br/>swipe to make a"
+ + "small swipe gesture with<br/>some momentum.<br/><br/>"
+ + "The region should scroll to show a green region.<br/><br/>"
+ + "Next, perform a small scroll gesture that does<br/>not involve momentum. You should begin to<br/>see one of the colors "
+ + "to the side of the current<br/>green box. When you release the wheel, the<br/>region should scroll back to a single color.";
+ messageLocationH.appendChild(message);
+
+ var messageLocationV = document.getElementById('itemV0');
+ var message = document.createElement('div');
+ message.innerHTML = "<p>You should also be able to repeat these tests steps for this vertical region.<br/>"
+ messageLocationV.appendChild(message);
+ }
+ }
+ </script>
+ </head>
+ <body onload="onLoad();">
+ <div style="position: relative; width: 200px">
+ <div>Tests that the scroll-snap feature works properly in overflow regions.</div>
+ <div class="gallery" id="topTarget">
+ <div class="galleryDrawer">
+ <div id="itemH0" class="colorBox"></div>
+ <div id="itemH1" class="colorBox"></div>
+ <div id="itemH2" class="colorBox"></div>
+ <div id="itemH3" class="colorBox"></div>
+ <div id="itemH4" class="colorBox"></div>
+ <div id="itemH5" class="colorBox"></div>
+ </div>
+ </div>
+ <div class="gallery" id="bottomTarget">
+ <div class="galleryDrawer">
+ <div id="itemV0" class="colorBox"></div>
+ <div id="itemV1" class="colorBox"></div>
+ <div id="itemV2" class="colorBox"></div>
+ <div id="itemV3" class="colorBox"></div>
+ <div id="itemV4" class="colorBox"></div>
+ <div id="itemV5" class="colorBox"></div>
+ </div>
+ </div>
+ <div id="console"></div>
+ </div>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190422 => 190423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-01 19:12:51 UTC (rev 190422)
+++ trunk/Source/WebCore/ChangeLog 2015-10-01 19:31:22 UTC (rev 190423)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-10-01 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ Latch does not clear when a scroll snap animation is triggered
+ https://bugs.webkit.org/show_bug.cgi?id=149681
+ <rdar://problem/22733922>
+
+ Reviewed by Simon Fraser.
+
+ Test: tiled-drawing/scrolling/latched-div-with-scroll-snap.html
+
+ The scroll snap animation logic bypasses some of the normal clean-up code used
+ for wheel event handling. When this happens, the scroll latching state is not
+ cleared. In some cases this "stale" latch state is used when starting a new
+ gesture in the same frame. This causes the wrong page element to receive the
+ mouse wheel events, and hilarity ensues.
+
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::platformNotifyIfEndGesture): Clear latched state when
+ ending the gesture.
+
+2015-10-01 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> [Win] Unreviewed CMake build fixes.
</span><span class="cx">
</span><span class="cx"> * CMakeLists.txt: Match original Windows build flags for WebCoreTest.
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (190422 => 190423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2015-10-01 19:12:51 UTC (rev 190422)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2015-10-01 19:31:22 UTC (rev 190423)
</span><span class="lines">@@ -1068,8 +1068,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><del>- if (ScrollAnimator* scrollAnimator = scrollableArea->existingScrollAnimator())
</del><ins>+ if (ScrollAnimator* scrollAnimator = scrollableArea->existingScrollAnimator()) {
</ins><span class="cx"> scrollAnimator->processWheelEventForScrollSnap(wheelEvent);
</span><ins>+ if (scrollAnimator->isScrollSnapInProgress())
+ clearLatchedState();
+ }
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>