<!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>[183628] 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/183628">183628</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-04-30 10:21:55 -0700 (Thu, 30 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Expand test infrastructure to support scrolling tests (Part 3)
https://bugs.webkit.org/show_bug.cgi?id=144131
Reviewed by Eric Carlson.
Update the WK2 scrolling tests to use the new scroll trigger infrastructure to reduce the use of
timeouts.
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler.html:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div.html:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler.html:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe.html:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler.html:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe.html:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler.html:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe.html:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler.html:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe.html:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler.html:
* platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select.html:
* platform/mac-wk2/tiled-drawing/scrolling/overflow-scroll-zero-delta-wheel-events.html:
* platform/mac-wk2/tiled-drawing/scrolling/root-overflow-with-mousewheel.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatcheddivexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatcheddivwithhandlerexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatcheddivwithhandlerhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatcheddivhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatchedmainframeexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatchedmainframewithhandlerexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatchedmainframewithhandlerhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatchedmainframehtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchediframeexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchediframewithhandlerexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchediframewithhandlerhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchediframehtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchedmainframeexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchedmainframewithhandlerexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchedmainframewithhandlerhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchedmainframehtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedmainframeexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedmainframewithhandlerexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedmainframewithhandlerhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedmainframehtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedselectexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedselectwithhandlerexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedselectwithhandlerhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedselecthtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingoverflowscrollzerodeltawheeleventshtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/overflow-scroll-zero-delta-wheel-events.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingrootoverflowwithmousewheelhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/root-overflow-with-mousewheel.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/ChangeLog 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-04-30 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac] Expand test infrastructure to support scrolling tests (Part 3)
+ https://bugs.webkit.org/show_bug.cgi?id=144131
+
+ Reviewed by Eric Carlson.
+
+ Update the WK2 scrolling tests to use the new scroll trigger infrastructure to reduce the use of
+ timeouts.
+
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler.html:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div.html:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler.html:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe.html:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler.html:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe.html:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler.html:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe.html:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler.html:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe.html:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler.html:
+ * platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select.html:
+ * platform/mac-wk2/tiled-drawing/scrolling/overflow-scroll-zero-delta-wheel-events.html:
+ * platform/mac-wk2/tiled-drawing/scrolling/root-overflow-with-mousewheel.html:
+
</ins><span class="cx"> 2015-04-30 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> These should be saying HTTP/1.1 not HTTP/1.0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatcheddivexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-expected.txt (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-expected.txt 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-expected.txt 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -52,21 +52,17 @@
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-div display height = 350
-Mouse moved to (28, 475)
-Page before: 0, div before: 586
-Page after: 0, div after: 656
</del><span class="cx"> PASS Page did not receive wheel events.
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 2008.00 2326.00)
</del><ins>+ (bounds 2008.00 2266.00)
</ins><span class="cx"> (visible rect 0.00, 0.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 785.00 x 585.00)
</span><span class="cx"> (intersects coverage rect 1)
</span><span class="cx"> (contentsScale 1.00)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 2008.00 2326.00)
</del><ins>+ (bounds 2008.00 2266.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> (visible rect 0.00, 0.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 1570.00 x 1755.00)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatcheddivwithhandlerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler-expected.txt (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler-expected.txt 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler-expected.txt 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -52,22 +52,17 @@
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-div display height = 350
-Mouse moved to (28, 475)
-Page before: 0, div before: 586
-Page after: 0, div after: 656
</del><span class="cx"> PASS Page did not receive wheel events.
</span><del>-Document was initial target for 8 of the wheel events.
</del><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 2008.00 2341.00)
</del><ins>+ (bounds 2008.00 2266.00)
</ins><span class="cx"> (visible rect 0.00, 0.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 785.00 x 585.00)
</span><span class="cx"> (intersects coverage rect 1)
</span><span class="cx"> (contentsScale 1.00)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 2008.00 2341.00)
</del><ins>+ (bounds 2008.00 2266.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> (visible rect 0.00, 0.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 1570.00 x 1755.00)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatcheddivwithhandlerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler.html (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler.html 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div-with-handler.html 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -52,16 +52,11 @@
</span><span class="cx"> var pageScrollPositionAfter = document.body.scrollTop;
</span><span class="cx"> var divScrollPositionAfter = divTarget.scrollTop;
</span><span class="cx">
</span><del>- debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", div after: " + divScrollPositionAfter);
-
</del><span class="cx"> if (pageScrollPositionBefore != pageScrollPositionAfter)
</span><span class="cx"> testFailed("Page received wheel events.");
</span><span class="cx"> else
</span><span class="cx"> testPassed("Page did not receive wheel events.");
</span><span class="cx">
</span><del>- debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
</del><span class="cx"> if (window.internals) {
</span><span class="cx"> document.getElementById('layers').innerText = internals.layerTreeAsText(document,
</span><span class="cx"> internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
</span><span class="lines">@@ -81,10 +76,8 @@
</span><span class="cx">
</span><span class="cx"> // Scroll the #source until we reach the #target.
</span><span class="cx"> var startPosX = Math.round(divTarget.offsetLeft) + 20;
</span><del>- debug("div display height = " + Math.round(divTarget.clientHeight));
- var startPosY = Math.round(divTarget.offsetTop) + Math.round(divTarget.clientHeight) - 42; // One wheel turn before end.
</del><ins>+ var startPosY = Math.round(divTarget.offsetTop) + 100; // One wheel turn before end.
</ins><span class="cx"> eventSender.mouseMoveTo(startPosX, startPosY);
</span><del>- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
</del><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="lines">@@ -95,7 +88,7 @@
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
</span><del>- checkForScroll();
</del><ins>+ eventSender.callAfterScrollingCompletes(checkForScroll);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setupTopLevel()
</span><span class="lines">@@ -103,6 +96,8 @@
</span><span class="cx"> if (window.eventSender) {
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><ins>+
+ eventSender.monitorWheelEvents();
</ins><span class="cx"> setTimeout(scrollTest, 0);
</span><span class="cx"> } else {
</span><span class="cx"> var messageLocation = document.getElementById('parent');
</span><span class="lines">@@ -121,7 +116,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> <div class="scrollable_region">
</span><span class="cx"> <h3>Scrollable Region</h3>
</span><del>- <div id="target" style='overflow-y: auto; overflow-x: hidden; height: 350px;'>
</del><ins>+ <div id="target" style='overflow-y: auto; overflow-x: hidden; max-height: 350px;'>
</ins><span class="cx"> <table class="table" style='width: 99%'>
</span><span class="cx"> <tr><th>Count</th><th>DATA</th><th>Rev Count</th></tr>
</span><span class="cx"> <tr><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td></tr>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatcheddivhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div.html (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div.html 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-div.html 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -46,9 +46,6 @@
</span><span class="cx"> var pageScrollPositionAfter = document.body.scrollTop;
</span><span class="cx"> var divScrollPositionAfter = divTarget.scrollTop;
</span><span class="cx">
</span><del>- debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", div after: " + divScrollPositionAfter);
-
</del><span class="cx"> if (pageScrollPositionBefore != pageScrollPositionAfter)
</span><span class="cx"> testFailed("Page received wheel events.");
</span><span class="cx"> else
</span><span class="lines">@@ -73,10 +70,8 @@
</span><span class="cx">
</span><span class="cx"> // Scroll the #source until we reach the #target.
</span><span class="cx"> var startPosX = Math.round(divTarget.offsetLeft) + 20;
</span><del>- debug("div display height = " + Math.round(divTarget.clientHeight));
- var startPosY = Math.round(divTarget.offsetTop) + Math.round(divTarget.clientHeight) - 42; // One wheel turn before end.
</del><ins>+ var startPosY = Math.round(divTarget.offsetTop) + 100; // One wheel turn before end.
</ins><span class="cx"> eventSender.mouseMoveTo(startPosX, startPosY);
</span><del>- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
</del><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="lines">@@ -87,7 +82,7 @@
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
</span><del>- checkForScroll();
</del><ins>+ eventSender.callAfterScrollingCompletes(checkForScroll);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setupTopLevel()
</span><span class="lines">@@ -96,6 +91,7 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx">
</span><ins>+ eventSender.monitorWheelEvents();
</ins><span class="cx"> setTimeout(scrollTest, 0);
</span><span class="cx"> } else {
</span><span class="cx"> var messageLocation = document.getElementById('parent');
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatchedmainframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-expected.txt (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-expected.txt 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-expected.txt 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -52,20 +52,17 @@
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-Mouse moved to (28, 125)
-Page before: 0, div before: 0
-Page after: 70, div after: 0
</del><span class="cx"> PASS Scrollable div did not receive wheel events.
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 2008.00 2311.00)
</del><ins>+ (bounds 2008.00 2266.00)
</ins><span class="cx"> (visible rect 0.00, 70.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 70.00 785.00 x 585.00)
</span><span class="cx"> (intersects coverage rect 1)
</span><span class="cx"> (contentsScale 1.00)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 2008.00 2311.00)
</del><ins>+ (bounds 2008.00 2266.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> (visible rect 0.00, 70.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 1570.00 x 1755.00)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatchedmainframewithhandlerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -53,20 +53,17 @@
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><span class="cx"> Mouse moved to (28, 125)
</span><del>-Page before: 0, div before: 0
-Page after: 70, div after: 0
</del><span class="cx"> PASS Scrollable div did not receive wheel events.
</span><del>-Document was initial target for 8 of the wheel events.
</del><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 2008.00 2326.00)
</del><ins>+ (bounds 2008.00 2281.00)
</ins><span class="cx"> (visible rect 0.00, 70.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 70.00 785.00 x 585.00)
</span><span class="cx"> (intersects coverage rect 1)
</span><span class="cx"> (contentsScale 1.00)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 2008.00 2326.00)
</del><ins>+ (bounds 2008.00 2281.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> (visible rect 0.00, 70.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 1570.00 x 1755.00)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatchedmainframewithhandlerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler.html (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler.html 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler.html 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -59,16 +59,11 @@
</span><span class="cx"> var pageScrollPositionAfter = document.body.scrollTop;
</span><span class="cx"> var divScrollPositionAfter = divTarget.scrollTop;
</span><span class="cx">
</span><del>- debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", div after: " + divScrollPositionAfter);
-
</del><span class="cx"> if (divScrollPositionBefore != divScrollPositionAfter)
</span><span class="cx"> testFailed("Scrollable div consumed wheel events.");
</span><span class="cx"> else
</span><span class="cx"> testPassed("Scrollable div did not receive wheel events.");
</span><span class="cx">
</span><del>- debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
</del><span class="cx"> if (window.internals) {
</span><span class="cx"> document.getElementById('layers').innerText = internals.layerTreeAsText(document,
</span><span class="cx"> internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
</span><span class="lines">@@ -100,9 +95,8 @@
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
</span><del>-
</del><ins>+ eventSender.callAfterScrollingCompletes(checkForScroll);
</ins><span class="cx"> // We should finish via the scroll event; this will fire in the case of failure when the page doesn't scroll.
</span><del>- setTimeout(checkForScroll, 500);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setupTopLevel()
</span><span class="lines">@@ -111,6 +105,7 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx">
</span><ins>+ eventSender.monitorWheelEvents();
</ins><span class="cx"> setTimeout(scrollTest, 0);
</span><span class="cx"> } else {
</span><span class="cx"> var messageLocation = document.getElementById('parent');
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolldivlatchedmainframehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe.html (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe.html 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe.html 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -53,9 +53,6 @@
</span><span class="cx"> var pageScrollPositionAfter = document.body.scrollTop;
</span><span class="cx"> var divScrollPositionAfter = divTarget.scrollTop;
</span><span class="cx">
</span><del>- debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", div after: " + divScrollPositionAfter);
-
</del><span class="cx"> if (divScrollPositionBefore != divScrollPositionAfter)
</span><span class="cx"> testFailed("Scrollable div consumed wheel events.");
</span><span class="cx"> else
</span><span class="lines">@@ -81,7 +78,6 @@
</span><span class="cx"> var startPosX = Math.round(divTarget.offsetLeft) + 20;
</span><span class="cx"> var startPosY = Math.round(divTarget.offsetTop) - 42;
</span><span class="cx"> eventSender.mouseMoveTo(startPosX, startPosY);
</span><del>- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
</del><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="lines">@@ -92,9 +88,8 @@
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
</span><del>-
</del><ins>+ eventSender.callAfterScrollingCompletes(checkForScroll);
</ins><span class="cx"> // We should finish via the scroll event; this will fire in the case of failure when the page doesn't scroll.
</span><del>- setTimeout(checkForScroll, 500);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setupTopLevel()
</span><span class="lines">@@ -103,6 +98,7 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx">
</span><ins>+ eventSender.monitorWheelEvents();
</ins><span class="cx"> setTimeout(scrollTest, 0);
</span><span class="cx"> } else {
</span><span class="cx"> var messageLocation = document.getElementById('parent');
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchediframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-expected.txt (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-expected.txt 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-expected.txt 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -8,21 +8,17 @@
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-IFrame display height = 500
-Mouse moved to (28, 566)
-Page before: 0, IFrame before: 416
-Page after: 0, IFrame after: 486
</del><span class="cx"> PASS Page did not receive wheel events.
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 785.00 2326.00)
</del><ins>+ (bounds 785.00 2266.00)
</ins><span class="cx"> (visible rect 0.00, 0.00 785.00 x 600.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 785.00 x 600.00)
</span><span class="cx"> (intersects coverage rect 1)
</span><span class="cx"> (contentsScale 1.00)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 785.00 2326.00)
</del><ins>+ (bounds 785.00 2266.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> (visible rect 0.00, 0.00 785.00 x 600.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 1570.00 x 1800.00)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchediframewithhandlerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler-expected.txt (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler-expected.txt 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler-expected.txt 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -8,22 +8,17 @@
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-IFrame display height = 500
-Mouse moved to (28, 566)
-Page before: 0, IFrame before: 416
-Page after: 0, IFrame after: 486
</del><span class="cx"> PASS Page did not receive wheel events.
</span><del>-Document was initial target for 0 of the wheel events.
</del><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 785.00 2341.00)
</del><ins>+ (bounds 785.00 2266.00)
</ins><span class="cx"> (visible rect 0.00, 0.00 785.00 x 600.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 785.00 x 600.00)
</span><span class="cx"> (intersects coverage rect 1)
</span><span class="cx"> (contentsScale 1.00)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 785.00 2341.00)
</del><ins>+ (bounds 785.00 2266.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> (visible rect 0.00, 0.00 785.00 x 600.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 1570.00 x 1800.00)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchediframewithhandlerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler.html (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler.html 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe-with-handler.html 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -28,16 +28,11 @@
</span><span class="cx"> var pageScrollPositionAfter = document.body.scrollTop;
</span><span class="cx"> var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop;
</span><span class="cx">
</span><del>- debug("Page before: " + pageScrollPositionBefore + ", IFrame before: " + iFrameScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", IFrame after: " + iFrameScrollPositionAfter);
-
</del><span class="cx"> if (pageScrollPositionBefore != pageScrollPositionAfter)
</span><span class="cx"> testFailed("Page received wheel events.");
</span><span class="cx"> else
</span><span class="cx"> testPassed("Page did not receive wheel events.");
</span><span class="cx">
</span><del>- debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
</del><span class="cx"> if (window.internals) {
</span><span class="cx"> document.getElementById('layers').innerText = internals.layerTreeAsText(document,
</span><span class="cx"> internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
</span><span class="lines">@@ -58,11 +53,9 @@
</span><span class="cx"> iFrameScrollPositionBefore = iFrameBody.scrollTop;
</span><span class="cx">
</span><span class="cx"> // Scroll the #source until we reach the #target.
</span><del>- var startPosX = iframeTarget.offsetLeft + 20;
- debug("IFrame display height = " + iframeTarget.clientHeight);
- var startPosY = iframeTarget.offsetTop + iframeTarget.clientHeight - 42; // One wheel turn before end.
- eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
</del><ins>+ var startPosX = Math.round(iframeTarget.offsetLeft) + 20;
+ var startPosY = Math.round(iframeTarget.offsetTop) + 100;
+ eventSender.mouseMoveTo(startPosX, startPosY);
</ins><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="lines">@@ -73,7 +66,7 @@
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
</span><del>- checkForScroll();
</del><ins>+ eventSender.callAfterScrollingCompletes(checkForScroll);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setupTopLevel()
</span><span class="lines">@@ -82,6 +75,7 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx">
</span><ins>+ eventSender.monitorWheelEvents();
</ins><span class="cx"> setTimeout(scrollTest, 0);
</span><span class="cx"> } else {
</span><span class="cx"> var messageLocation = document.getElementById('parent');
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchediframehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe.html (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe.html 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-iframe.html 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -14,12 +14,10 @@
</span><span class="cx">
</span><span class="cx"> function checkForScroll()
</span><span class="cx"> {
</span><ins>+ // The IFrame should not have scrolled at all.
</ins><span class="cx"> var pageScrollPositionAfter = document.body.scrollTop;
</span><span class="cx"> var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop;
</span><span class="cx">
</span><del>- debug("Page before: " + pageScrollPositionBefore + ", IFrame before: " + iFrameScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", IFrame after: " + iFrameScrollPositionAfter);
-
</del><span class="cx"> if (pageScrollPositionBefore != pageScrollPositionAfter)
</span><span class="cx"> testFailed("Page received wheel events.");
</span><span class="cx"> else
</span><span class="lines">@@ -44,11 +42,10 @@
</span><span class="cx">
</span><span class="cx"> iFrameScrollPositionBefore = iFrameBody.scrollTop;
</span><span class="cx">
</span><del>- var startPosX = iframeTarget.offsetLeft + 20;
- debug("IFrame display height = " + iframeTarget.clientHeight);
- var startPosY = iframeTarget.offsetTop + iframeTarget.clientHeight - 42;
</del><ins>+ // Scroll the #source until we reach the #target.
+ var startPosX = Math.round(iframeTarget.offsetLeft) + 20;
+ var startPosY = Math.round(iframeTarget.offsetTop) + 100;
</ins><span class="cx"> eventSender.mouseMoveTo(startPosX, startPosY);
</span><del>- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
</del><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="lines">@@ -59,7 +56,7 @@
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
</span><del>- checkForScroll();
</del><ins>+ eventSender.callAfterScrollingCompletes(checkForScroll);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setupTopLevel()
</span><span class="lines">@@ -68,6 +65,7 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx">
</span><ins>+ eventSender.monitorWheelEvents();
</ins><span class="cx"> setTimeout(scrollTest, 0);
</span><span class="cx"> } else {
</span><span class="cx"> var messageLocation = document.getElementById('parent');
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchedmainframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-expected.txt (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-expected.txt 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-expected.txt 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -8,20 +8,17 @@
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-Mouse moved to (28, 66)
-Page before: 0, IFrame before: 0
-Page after: 70, IFrame after: 0
</del><span class="cx"> PASS IFrame did not receive wheel events.
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 785.00 2311.00)
</del><ins>+ (bounds 785.00 2266.00)
</ins><span class="cx"> (visible rect 0.00, 70.00 785.00 x 600.00)
</span><span class="cx"> (coverage rect 0.00, 70.00 785.00 x 600.00)
</span><span class="cx"> (intersects coverage rect 1)
</span><span class="cx"> (contentsScale 1.00)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 785.00 2311.00)
</del><ins>+ (bounds 785.00 2266.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> (visible rect 0.00, 70.00 785.00 x 600.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 1570.00 x 1800.00)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchedmainframewithhandlerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -8,21 +8,17 @@
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-Mouse moved to (28, 66)
-Page before: 0, IFrame before: 0
-Page after: 70, IFrame after: 0
</del><span class="cx"> PASS IFrame did not receive wheel events.
</span><del>-Document was initial target for 8 of the wheel events.
</del><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 785.00 2326.00)
</del><ins>+ (bounds 785.00 2266.00)
</ins><span class="cx"> (visible rect 0.00, 70.00 785.00 x 600.00)
</span><span class="cx"> (coverage rect 0.00, 70.00 785.00 x 600.00)
</span><span class="cx"> (intersects coverage rect 1)
</span><span class="cx"> (contentsScale 1.00)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 785.00 2326.00)
</del><ins>+ (bounds 785.00 2266.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> (visible rect 0.00, 70.00 785.00 x 600.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 1570.00 x 1800.00)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchedmainframewithhandlerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler.html (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler.html 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler.html 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -35,16 +35,11 @@
</span><span class="cx"> var pageScrollPositionAfter = document.body.scrollTop;
</span><span class="cx"> var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop;
</span><span class="cx">
</span><del>- debug("Page before: " + pageScrollPositionBefore + ", IFrame before: " + iFrameScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", IFrame after: " + iFrameScrollPositionAfter);
-
</del><span class="cx"> if (iFrameScrollPositionBefore != iFrameScrollPositionAfter)
</span><span class="cx"> testFailed("IFrame consumed wheel events.");
</span><span class="cx"> else
</span><span class="cx"> testPassed("IFrame did not receive wheel events.");
</span><span class="cx">
</span><del>- debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
</del><span class="cx"> if (window.internals) {
</span><span class="cx"> document.getElementById('layers').innerText = internals.layerTreeAsText(document,
</span><span class="cx"> internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
</span><span class="lines">@@ -60,10 +55,11 @@
</span><span class="cx">
</span><span class="cx"> iframeTarget = document.getElementById('target');
</span><span class="cx">
</span><del>- var startPosX = iframeTarget.offsetLeft + 20;
- var startPosY = iframeTarget.offsetTop - 42;
</del><ins>+ // Scroll the #source until we reach the #target.
+ var startPosX = Math.round(iframeTarget.offsetLeft) + 20;
+ var startPosY = Math.round(iframeTarget.offsetTop) - 42; // Slightly more than one wheel scroll away from the IFrame
</ins><span class="cx"> eventSender.mouseMoveTo(startPosX, startPosY);
</span><del>- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
</del><ins>+ //debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
</ins><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="lines">@@ -74,9 +70,9 @@
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
</span><ins>+ eventSender.callAfterScrollingCompletes(checkForScroll);
</ins><span class="cx">
</span><span class="cx"> // We should finish via the scroll event; this will fire in the case of failure when the page doesn't scroll.
</span><del>- setTimeout(checkForScroll, 500);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setupTopLevel()
</span><span class="lines">@@ -85,6 +81,7 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx">
</span><ins>+ eventSender.monitorWheelEvents();
</ins><span class="cx"> setTimeout(scrollTest, 0);
</span><span class="cx"> } else {
</span><span class="cx"> var messageLocation = document.getElementById('parent');
</span><span class="lines">@@ -98,11 +95,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </script>
</span><del>-<div id="parent" style="height: 2000px">
</del><ins>+<div id="parent" style="height: 2000px;">
</ins><span class="cx"> <div id="source" style="height: 100px">
</span><span class="cx"> Put mouse here and flick downwards
</span><span class="cx"> </div>
</span><del>- <iframe id="target" name="target" style="border:solid 1px green; height: 500px; width: 500px;"
</del><ins>+ <iframe id="target" name="target" style="border:solid 1px green; height: 300px; width: 500px;"
</ins><span class="cx"> src= "data:text/html,
</span><span class="cx"> <div id='notToBeScrolled' style='height: 1000px; width: 1000px;'>
</span><span class="cx"> TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP<br/><br/>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrolliframelatchedmainframehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe.html (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe.html 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe.html 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -29,9 +29,6 @@
</span><span class="cx"> var pageScrollPositionAfter = document.body.scrollTop;
</span><span class="cx"> var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop;
</span><span class="cx">
</span><del>- debug("Page before: " + pageScrollPositionBefore + ", IFrame before: " + iFrameScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", IFrame after: " + iFrameScrollPositionAfter);
-
</del><span class="cx"> if (iFrameScrollPositionBefore != iFrameScrollPositionAfter)
</span><span class="cx"> testFailed("IFrame consumed wheel events.");
</span><span class="cx"> else
</span><span class="lines">@@ -51,11 +48,11 @@
</span><span class="cx"> iFrameScrollPositionBefore = window.frames['target'].document.body.scrollTop;
</span><span class="cx">
</span><span class="cx"> iframeTarget = document.getElementById('target');
</span><del>-
- var startPosX = iframeTarget.offsetLeft + 20;
- var startPosY = iframeTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
</del><ins>+
+ // Scroll the #source until we reach the #target.
+ var startPosX = Math.round(iframeTarget.offsetLeft) + 20;
+ var startPosY = Math.round(iframeTarget.offsetTop) - 42; // Slightly more than one wheel scroll away from the IFrame
</ins><span class="cx"> eventSender.mouseMoveTo(startPosX, startPosY);
</span><del>- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
</del><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="lines">@@ -66,9 +63,9 @@
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
</span><ins>+ eventSender.callAfterScrollingCompletes(checkForScroll);
</ins><span class="cx">
</span><span class="cx"> // We should finish via the scroll event; this will fire in the case of failure when the page doesn't scroll.
</span><del>- setTimeout(checkForScroll, 500);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setupTopLevel()
</span><span class="lines">@@ -77,6 +74,7 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx">
</span><ins>+ eventSender.monitorWheelEvents();
</ins><span class="cx"> setTimeout(scrollTest, 0);
</span><span class="cx"> } else {
</span><span class="cx"> var messageLocation = document.getElementById('parent');
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedmainframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-expected.txt (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-expected.txt 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-expected.txt 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -10,20 +10,17 @@
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-Mouse moved to (30, 127)
-Page before: 0, select before: 0
-Page after: 70, select after: 0
</del><span class="cx"> PASS Select did not receive wheel events.
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 2008.00 2311.00)
</del><ins>+ (bounds 2008.00 2266.00)
</ins><span class="cx"> (visible rect 0.00, 70.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 70.00 785.00 x 585.00)
</span><span class="cx"> (intersects coverage rect 1)
</span><span class="cx"> (contentsScale 1.00)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 2008.00 2311.00)
</del><ins>+ (bounds 2008.00 2266.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> (visible rect 0.00, 70.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 1570.00 x 1755.00)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedmainframewithhandlerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler-expected.txt (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler-expected.txt 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler-expected.txt 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -10,21 +10,17 @@
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-Mouse moved to (30, 127)
-Page before: 0, select before: 0
-Page after: 70, select after: 0
</del><span class="cx"> PASS Select did not receive wheel events.
</span><del>-Document was initial target for 8 of the wheel events.
</del><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 2008.00 2326.00)
</del><ins>+ (bounds 2008.00 2266.00)
</ins><span class="cx"> (visible rect 0.00, 70.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 70.00 785.00 x 585.00)
</span><span class="cx"> (intersects coverage rect 1)
</span><span class="cx"> (contentsScale 1.00)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 2008.00 2326.00)
</del><ins>+ (bounds 2008.00 2266.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> (visible rect 0.00, 70.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 1570.00 x 1755.00)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedmainframewithhandlerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler.html (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler.html 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler.html 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -59,16 +59,11 @@
</span><span class="cx"> var pageScrollPositionAfter = document.body.scrollTop;
</span><span class="cx"> var selectScrollPositionAfter = selectTarget.scrollTop;
</span><span class="cx">
</span><del>- debug("Page before: " + pageScrollPositionBefore + ", select before: " + selectScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", select after: " + selectScrollPositionAfter);
-
</del><span class="cx"> if (selectScrollPositionBefore != selectScrollPositionAfter)
</span><span class="cx"> testFailed("Select consumed wheel events.");
</span><span class="cx"> else
</span><span class="cx"> testPassed("Select did not receive wheel events.");
</span><span class="cx">
</span><del>- debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
</del><span class="cx"> if (window.internals) {
</span><span class="cx"> document.getElementById('layers').innerText = internals.layerTreeAsText(document,
</span><span class="cx"> internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
</span><span class="lines">@@ -85,10 +80,10 @@
</span><span class="cx">
</span><span class="cx"> selectScrollPositionBefore = selectTarget.scrollTop;
</span><span class="cx">
</span><ins>+ // Scroll the #source until we reach the #target.
</ins><span class="cx"> var startPosX = Math.round(selectTarget.offsetLeft) + 20;
</span><span class="cx"> var startPosY = Math.round(selectTarget.offsetTop) - 42;
</span><span class="cx"> eventSender.mouseMoveTo(startPosX, startPosY);
</span><del>- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
</del><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="lines">@@ -99,9 +94,9 @@
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
</span><ins>+ eventSender.callAfterScrollingCompletes(checkForScroll);
</ins><span class="cx">
</span><span class="cx"> // We should finish via the scroll event; this will fire in the case of failure when the page doesn't scroll.
</span><del>- setTimeout(checkForScroll, 500);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setupTopLevel()
</span><span class="lines">@@ -110,6 +105,7 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx">
</span><ins>+ eventSender.monitorWheelEvents();
</ins><span class="cx"> setTimeout(scrollTest, 0);
</span><span class="cx"> } else {
</span><span class="cx"> var messageLocation = document.getElementById('parent');
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedmainframehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe.html (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe.html 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-mainframe.html 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -53,9 +53,6 @@
</span><span class="cx"> var pageScrollPositionAfter = document.body.scrollTop;
</span><span class="cx"> var selectScrollPositionAfter = selectTarget.scrollTop;
</span><span class="cx">
</span><del>- debug("Page before: " + pageScrollPositionBefore + ", select before: " + selectScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", select after: " + selectScrollPositionAfter);
-
</del><span class="cx"> if (selectScrollPositionBefore != selectScrollPositionAfter)
</span><span class="cx"> testFailed("Select consumed wheel events.");
</span><span class="cx"> else
</span><span class="lines">@@ -81,7 +78,6 @@
</span><span class="cx"> var startPosX = Math.round(selectTarget.offsetLeft) + 20;
</span><span class="cx"> var startPosY = Math.round(selectTarget.offsetTop) - 42;
</span><span class="cx"> eventSender.mouseMoveTo(startPosX, startPosY);
</span><del>- debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
</del><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
</span><span class="lines">@@ -92,9 +88,9 @@
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
</span><ins>+ eventSender.callAfterScrollingCompletes(checkForScroll);
</ins><span class="cx">
</span><span class="cx"> // We should finish via the scroll event; this will fire in the case of failure when the page doesn't scroll.
</span><del>- setTimeout(checkForScroll, 500);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setupTopLevel()
</span><span class="lines">@@ -103,6 +99,7 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx">
</span><ins>+ eventSender.monitorWheelEvents();
</ins><span class="cx"> setTimeout(scrollTest, 0);
</span><span class="cx"> } else {
</span><span class="cx"> var messageLocation = document.getElementById('parent');
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedselectexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-expected.txt (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-expected.txt 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-expected.txt 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -12,19 +12,17 @@
</span><span class="cx"> TEST COMPLETE
</span><span class="cx"> div display height = 111
</span><span class="cx"> Mouse moved to (30, 238)
</span><del>-Page before: 0, select before: 70
-Page after: 0, select after: 140
</del><span class="cx"> PASS Page did not receive wheel events.
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 2008.00 2326.00)
</del><ins>+ (bounds 2008.00 2296.00)
</ins><span class="cx"> (visible rect 0.00, 0.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 785.00 x 585.00)
</span><span class="cx"> (intersects coverage rect 1)
</span><span class="cx"> (contentsScale 1.00)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 2008.00 2326.00)
</del><ins>+ (bounds 2008.00 2296.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> (visible rect 0.00, 0.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 1570.00 x 1755.00)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedselectwithhandlerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler-expected.txt (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler-expected.txt 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler-expected.txt 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -12,20 +12,18 @@
</span><span class="cx"> TEST COMPLETE
</span><span class="cx"> div display height = 111
</span><span class="cx"> Mouse moved to (30, 238)
</span><del>-Page before: 0, select before: 70
-Page after: 0, select after: 140
</del><span class="cx"> PASS Page did not receive wheel events.
</span><span class="cx"> Document was initial target for 8 of the wheel events.
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><del>- (bounds 2008.00 2341.00)
</del><ins>+ (bounds 2008.00 2311.00)
</ins><span class="cx"> (visible rect 0.00, 0.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 785.00 x 585.00)
</span><span class="cx"> (intersects coverage rect 1)
</span><span class="cx"> (contentsScale 1.00)
</span><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><del>- (bounds 2008.00 2341.00)
</del><ins>+ (bounds 2008.00 2311.00)
</ins><span class="cx"> (contentsOpaque 1)
</span><span class="cx"> (visible rect 0.00, 0.00 785.00 x 585.00)
</span><span class="cx"> (coverage rect 0.00, 0.00 1570.00 x 1755.00)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedselectwithhandlerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler.html (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler.html 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select-with-handler.html 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -52,9 +52,6 @@
</span><span class="cx"> var pageScrollPositionAfter = document.body.scrollTop;
</span><span class="cx"> var selectScrollPositionAfter = selectTarget.scrollTop;
</span><span class="cx">
</span><del>- debug("Page before: " + pageScrollPositionBefore + ", select before: " + selectScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", select after: " + selectScrollPositionAfter);
-
</del><span class="cx"> if (pageScrollPositionBefore != pageScrollPositionAfter)
</span><span class="cx"> testFailed("Page received wheel events.");
</span><span class="cx"> else
</span><span class="lines">@@ -79,6 +76,7 @@
</span><span class="cx">
</span><span class="cx"> selectScrollPositionBefore = selectTarget.scrollTop;
</span><span class="cx">
</span><ins>+ // Scroll the #source until we reach the #target.
</ins><span class="cx"> var startPosX = Math.round(selectTarget.offsetLeft) + 20;
</span><span class="cx"> debug("div display height = " + Math.round(selectTarget.clientHeight));
</span><span class="cx"> var startPosY = Math.round(selectTarget.offsetTop) + Math.round(selectTarget.clientHeight) - 42;
</span><span class="lines">@@ -94,7 +92,7 @@
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
</span><del>- checkForScroll();
</del><ins>+ eventSender.callAfterScrollingCompletes(checkForScroll);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setupTopLevel()
</span><span class="lines">@@ -103,6 +101,7 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx">
</span><ins>+ eventSender.monitorWheelEvents();
</ins><span class="cx"> setTimeout(scrollTest, 0);
</span><span class="cx"> } else {
</span><span class="cx"> var messageLocation = document.getElementById('parent');
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfastscrollselectlatchedselecthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select.html (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select.html 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-select-latched-select.html 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -46,9 +46,6 @@
</span><span class="cx"> var pageScrollPositionAfter = document.body.scrollTop;
</span><span class="cx"> var selectScrollPositionAfter = selectTarget.scrollTop;
</span><span class="cx">
</span><del>- debug("Page before: " + pageScrollPositionBefore + ", select before: " + selectScrollPositionBefore);
- debug("Page after: " + pageScrollPositionAfter + ", select after: " + selectScrollPositionAfter);
-
</del><span class="cx"> if (pageScrollPositionBefore != pageScrollPositionAfter)
</span><span class="cx"> testFailed("Page received wheel events.");
</span><span class="cx"> else
</span><span class="lines">@@ -87,7 +84,7 @@
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
</span><del>- checkForScroll();
</del><ins>+ eventSender.callAfterScrollingCompletes(checkForScroll);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setupTopLevel()
</span><span class="lines">@@ -96,6 +93,7 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx">
</span><ins>+ eventSender.monitorWheelEvents();
</ins><span class="cx"> setTimeout(scrollTest, 0);
</span><span class="cx"> } else {
</span><span class="cx"> var messageLocation = document.getElementById('parent');
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingoverflowscrollzerodeltawheeleventshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/overflow-scroll-zero-delta-wheel-events.html (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/overflow-scroll-zero-delta-wheel-events.html 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/overflow-scroll-zero-delta-wheel-events.html 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -50,8 +50,7 @@
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
</span><del>-
- setTimeout(checkForZero, 0);
</del><ins>+ eventSender.callAfterScrollingCompletes(checkForZero);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setUp() {
</span><span class="lines">@@ -62,6 +61,7 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx">
</span><ins>+ eventSender.monitorWheelEvents();
</ins><span class="cx"> setTimeout(scrollTest, 0);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingrootoverflowwithmousewheelhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/root-overflow-with-mousewheel.html (183627 => 183628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/root-overflow-with-mousewheel.html 2015-04-30 17:17:59 UTC (rev 183627)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/root-overflow-with-mousewheel.html 2015-04-30 17:21:55 UTC (rev 183628)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
</span><span class="cx"> eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
</span><del>- setTimeout(checkForScroll, 500);
</del><ins>+ eventSender.callAfterScrollingCompletes(checkForScroll);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function onLoad() {
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> if (window.eventSender) {
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><ins>+ eventSender.monitorWheelEvents();
</ins><span class="cx"> setTimeout(scrollTest, 0);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>