<!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>[202304] trunk/LayoutTests</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/202304">202304</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-06-21 16:32:34 -0700 (Tue, 21 Jun 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>LayoutTest tiled-drawing/scrolling/latched-div-with-scroll-snap.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=158320

Reviewed by Simon Fraser.

This test case is flaky because:
1. There are multiple mouseScrollByWithWheelAndMomentumPhases() event bundles and they all need their own
callbacks. (see additional eventSender.callAfterScrollingCompletes()) -&gt; fail
2. When the test fails, the testFailed() function is called with undefined variables. -&gt; timeout

* platform/mac-wk2/TestExpectations:
* tiled-drawing/scrolling/latched-div-with-scroll-snap.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</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 (202303 => 202304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-06-21 23:24:37 UTC (rev 202303)
+++ trunk/LayoutTests/ChangeLog        2016-06-21 23:32:34 UTC (rev 202304)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-06-21  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        LayoutTest tiled-drawing/scrolling/latched-div-with-scroll-snap.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=158320
+
+        Reviewed by Simon Fraser.
+
+        This test case is flaky because:
+        1. There are multiple mouseScrollByWithWheelAndMomentumPhases() event bundles and they all need their own
+        callbacks. (see additional eventSender.callAfterScrollingCompletes()) -&gt; fail
+        2. When the test fails, the testFailed() function is called with undefined variables. -&gt; timeout  
+
+        * platform/mac-wk2/TestExpectations:
+        * tiled-drawing/scrolling/latched-div-with-scroll-snap.html:
+
</ins><span class="cx"> 2016-06-21  Jiewen Tan  &lt;jiewen_tan@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r200619.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (202303 => 202304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations        2016-06-21 23:24:37 UTC (rev 202303)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations        2016-06-21 23:32:34 UTC (rev 202304)
</span><span class="lines">@@ -258,8 +258,6 @@
</span><span class="cx"> webkit.org/b/148408 tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html [ Pass Failure ]
</span><span class="cx"> webkit.org/b/148408 tiled-drawing/scrolling/root-overflow-with-mousewheel.html [ Pass Failure Timeout ]
</span><span class="cx"> 
</span><del>-webkit.org/b/158320 tiled-drawing/scrolling/latched-div-with-scroll-snap.html [ Pass Failure Timeout ]
-
</del><span class="cx"> webkit.org/b/139820 fast/frames/lots-of-objects.html [ Timeout ]
</span><span class="cx"> webkit.org/b/139820 fast/frames/lots-of-iframes.html [ Pass Timeout ]
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTeststileddrawingscrollinglatcheddivwithscrollsnaphtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/tiled-drawing/scrolling/latched-div-with-scroll-snap.html (202303 => 202304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/tiled-drawing/scrolling/latched-div-with-scroll-snap.html        2016-06-21 23:24:37 UTC (rev 202303)
+++ trunk/LayoutTests/tiled-drawing/scrolling/latched-div-with-scroll-snap.html        2016-06-21 23:32:34 UTC (rev 202304)
</span><span class="lines">@@ -82,6 +82,13 @@
</span><span class="cx">             finishJSTest();
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        function performSwipeGestureOnElementEnd()
+        {
+            eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'none', 'begin');
+            eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'none', 'continue');
+            eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
+        }
+
</ins><span class="cx">         function performSwipeGestureOnElement(divTarget)
</span><span class="cx">         {
</span><span class="cx">             var windowPosition = locationInWindowCoordinates(divTarget);
</span><span class="lines">@@ -88,6 +95,7 @@
</span><span class="cx">             var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth;
</span><span class="cx">             var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight;
</span><span class="cx"> 
</span><ins>+            eventSender.monitorWheelEvents();
</ins><span class="cx">             eventSender.mouseMoveTo(startPosX, startPosY);
</span><span class="cx">             eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'began', 'none');
</span><span class="cx">             eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
</span><span class="lines">@@ -94,9 +102,6 @@
</span><span class="cx">             eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
</span><span class="cx">             eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
</span><span class="cx">             eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none');
</span><del>-            eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'none', 'begin');
-            eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'none', 'continue');
-            eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
</del><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         function scrollInSecondDiv()
</span><span class="lines">@@ -109,7 +114,12 @@
</span><span class="cx"> 
</span><span class="cx">             performSwipeGestureOnElement(divTarget);
</span><span class="cx"> 
</span><del>-            eventSender.callAfterScrollingCompletes(function() { return checkForSecondaryScrollGlide(); });           
</del><ins>+            eventSender.callAfterScrollingCompletes(function() { 
+                performSwipeGestureOnElementEnd();
+                eventSender.callAfterScrollingCompletes(function() {
+                    setTimeout(function() { checkForSecondaryScrollGlide(); }, 10); 
+                });
+            });           
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         function checkForScrollSnap()
</span><span class="lines">@@ -119,12 +129,13 @@
</span><span class="cx">             var actualPosition = divTarget.scrollLeft;
</span><span class="cx"> 
</span><span class="cx">             // The div should have snapped back to the previous position
</span><del>-            if (actualPosition != divScrollPositionBeforeSnap)
-                testFailed(&quot;div did not snap back to proper location for &quot; + targetLabel +&quot;. Expected &quot; + divScrollPositionBeforeSnap + &quot;, but got &quot; + actualPosition);
-            else
</del><ins>+            if (actualPosition != divScrollPositionBeforeSnap) {
+                testFailed(&quot;div did not snap back to proper location for &quot; + divTarget +&quot;. Expected &quot; + divScrollPositionBeforeSnap + &quot;, but got &quot; + actualPosition);
+                finishJSTest();
+                return;
+            } else
</ins><span class="cx">                 testPassed(&quot;div honored snap points.&quot;);
</span><del>-
-            setTimeout(function() { scrollInSecondDiv() }, 0);
</del><ins>+            scrollInSecondDiv();
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         function scrollSnapTest()
</span><span class="lines">@@ -137,12 +148,13 @@
</span><span class="cx">             var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth;
</span><span class="cx">             var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight;
</span><span class="cx"> 
</span><ins>+            eventSender.monitorWheelEvents();
</ins><span class="cx">             eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
</span><span class="cx">             eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'began', 'none');
</span><span class="cx">             eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
</span><span class="cx">             eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
</span><span class="cx">             eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none');
</span><del>-            eventSender.callAfterScrollingCompletes(function() { return checkForScrollSnap(); });
</del><ins>+            eventSender.callAfterScrollingCompletes(function() { checkForScrollSnap(); });
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         function checkForScrollGlide(targetLabel)
</span><span class="lines">@@ -155,10 +167,12 @@
</span><span class="cx">             // The div should have scrolled (glided) to the next snap point.
</span><span class="cx">             if (actualPosition == expectedPosition)
</span><span class="cx">                 testPassed(&quot;div scrolled to next window.&quot;);
</span><del>-            else
</del><ins>+            else {
</ins><span class="cx">                 testFailed(&quot;div did not honor snap points. Expected &quot; + expectedPosition + &quot;, but got &quot; + actualPosition);
</span><del>-
-            setTimeout(function() { scrollSnapTest() }, 0);
</del><ins>+                finishJSTest();
+                return;
+            }
+            scrollSnapTest();
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         function scrollGlideTest()
</span><span class="lines">@@ -168,17 +182,19 @@
</span><span class="cx">             divScrollPositionBeforeGlide = divTarget.scrollLeft;
</span><span class="cx"> 
</span><span class="cx">             performSwipeGestureOnElement(divTarget);
</span><del>-    
-            eventSender.callAfterScrollingCompletes(function() { return checkForScrollGlide(); });
</del><ins>+            eventSender.callAfterScrollingCompletes(function() { 
+                performSwipeGestureOnElementEnd();
+                eventSender.callAfterScrollingCompletes(function() {
+                    setTimeout(function() { checkForScrollGlide(); }, 10); 
+                });
+            });           
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         function onLoad()
</span><span class="cx">         {
</span><span class="cx">             if (window.eventSender) {
</span><del>-                eventSender.monitorWheelEvents();
</del><span class="cx">                 testRunner.dumpAsText();
</span><del>-                testRunner.waitUntilDone();
-                setTimeout(function() { scrollGlideTest() }, 0);
</del><ins>+                scrollGlideTest();
</ins><span class="cx">             } else {
</span><span class="cx">                 var messageLocationH = document.getElementById('itemH0');
</span><span class="cx">                 var message = document.createElement('div');
</span></span></pre>
</div>
</div>

</body>
</html>