<!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>[196719] 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/196719">196719</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-02-17 13:44:02 -0800 (Wed, 17 Feb 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add tests for iframe and overflow scrollability after navigating back
https://bugs.webkit.org/show_bug.cgi?id=154300

Fix the tests added in <a href="http://trac.webkit.org/projects/webkit/changeset/196665">r196665</a> to be agnostic about how many pixels a wheel event scrolls.

* fast/scrolling/iframe-scrollable-after-back-expected.txt:
* fast/scrolling/iframe-scrollable-after-back.html:
* fast/scrolling/overflow-scrollable-after-back-expected.txt:
* fast/scrolling/overflow-scrollable-after-back.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastscrollingiframescrollableafterbackexpectedtxt">trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastscrollingiframescrollableafterbackhtml">trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back.html</a></li>
<li><a href="#trunkLayoutTestsfastscrollingoverflowscrollableafterbackexpectedtxt">trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastscrollingoverflowscrollableafterbackhtml">trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196718 => 196719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-02-17 21:33:34 UTC (rev 196718)
+++ trunk/LayoutTests/ChangeLog        2016-02-17 21:44:02 UTC (rev 196719)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-02-17  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        Add tests for iframe and overflow scrollability after navigating back
+        https://bugs.webkit.org/show_bug.cgi?id=154300
+
+        Fix the tests added in r196665 to be agnostic about how many pixels a wheel event scrolls.
+
+        * fast/scrolling/iframe-scrollable-after-back-expected.txt:
+        * fast/scrolling/iframe-scrollable-after-back.html:
+        * fast/scrolling/overflow-scrollable-after-back-expected.txt:
+        * fast/scrolling/overflow-scrollable-after-back.html:
+
</ins><span class="cx"> 2016-02-17  Skachkov Oleksandr  &lt;gskachkov@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [ES6] Arrow function. Arrow function should raise exception ReferenceError only when access to 'arguments'  on top level
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingiframescrollableafterbackexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back-expected.txt (196718 => 196719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back-expected.txt        2016-02-17 21:33:34 UTC (rev 196718)
+++ trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back-expected.txt        2016-02-17 21:44:02 UTC (rev 196719)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> 
</span><del>-Sending wheel event; scrollTop is 0
-Scrolled; scrollTop is 20
</del><ins>+Sending mouseWheel events
+PASS: mouseWheel caused scrolling
</ins><span class="cx"> 
</span><span class="cx"> Navigating forward then back
</span><span class="cx"> 
</span><del>-Sending wheel event; scrollTop is 20
-Scrolled; scrollTop is 40
</del><ins>+Sending mouseWheel events
+PASS: mouseWheel caused scrolling
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingiframescrollableafterbackhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back.html (196718 => 196719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back.html        2016-02-17 21:33:34 UTC (rev 196718)
+++ trunk/LayoutTests/fast/scrolling/iframe-scrollable-after-back.html        2016-02-17 21:44:02 UTC (rev 196719)
</span><span class="lines">@@ -28,11 +28,17 @@
</span><span class="cx">             document.getElementById('result').textContent += s + &quot;\n&quot;;
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        var scrollTopBeforeScroll;
</ins><span class="cx">         var postScrollCallback;
</span><span class="cx"> 
</span><span class="cx">         function iframeScrolled()
</span><span class="cx">         {
</span><del>-            logResult('Scrolled; scrollTop is ' + document.getElementById('iframe').contentDocument.scrollingElement.scrollTop);
</del><ins>+            var newScrollTop = document.getElementById('iframe').contentDocument.scrollingElement.scrollTop;
+            if (newScrollTop &gt; scrollTopBeforeScroll)
+                logResult('PASS: mouseWheel caused scrolling');
+            else
+                logResult('FAIL; mouseWheel did not scroll; scrollTop is ' + newScrollTop + ', was ' + scrollTopBeforeScroll);
+
</ins><span class="cx">             if (postScrollCallback)
</span><span class="cx">                 postScrollCallback();
</span><span class="cx">         }
</span><span class="lines">@@ -42,7 +48,8 @@
</span><span class="cx">             var iframeTarget = document.getElementById('iframe');
</span><span class="cx">             var iframeBounds = iframeTarget.getBoundingClientRect();
</span><span class="cx">             
</span><del>-            logResult('Sending wheel event; scrollTop is ' + iframeTarget.contentDocument.scrollingElement.scrollTop);
</del><ins>+            scrollTopBeforeScroll = iframeTarget.contentDocument.scrollingElement.scrollTop;
+            logResult('Sending mouseWheel events');
</ins><span class="cx"> 
</span><span class="cx">             eventSender.mouseMoveTo(iframeBounds.left + 10, iframeBounds.top + 10);
</span><span class="cx">             eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingoverflowscrollableafterbackexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back-expected.txt (196718 => 196719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back-expected.txt        2016-02-17 21:33:34 UTC (rev 196718)
+++ trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back-expected.txt        2016-02-17 21:44:02 UTC (rev 196719)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><del>-Sending wheel event; scrollTop is 0
-Scrolled; scrollTop is 20
</del><ins>+Sending mouseWheel events
+PASS: mouseWheel caused scrolling
</ins><span class="cx"> 
</span><span class="cx"> Navigating forward then back
</span><span class="cx"> 
</span><del>-Sending wheel event; scrollTop is 20
-Scrolled; scrollTop is 40
</del><ins>+Sending mouseWheel events
+PASS: mouseWheel caused scrolling
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingoverflowscrollableafterbackhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back.html (196718 => 196719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back.html        2016-02-17 21:33:34 UTC (rev 196718)
+++ trunk/LayoutTests/fast/scrolling/overflow-scrollable-after-back.html        2016-02-17 21:44:02 UTC (rev 196719)
</span><span class="lines">@@ -28,11 +28,18 @@
</span><span class="cx">             document.getElementById('result').textContent += s + &quot;\n&quot;;
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        var scrollTopBeforeScroll;
</ins><span class="cx">         var postScrollCallback;
</span><span class="cx"> 
</span><span class="cx">         function divScrolled()
</span><span class="cx">         {
</span><del>-            logResult('Scrolled; scrollTop is ' + document.getElementById('overflowing').scrollTop);
</del><ins>+            var newScrollTop = document.getElementById('overflowing').scrollTop;
+
+            if (newScrollTop &gt; scrollTopBeforeScroll)
+                logResult('PASS: mouseWheel caused scrolling');
+            else
+                logResult('FAIL; mouseWheel did not scroll; scrollTop is ' + newScrollTop + ', was ' + scrollTopBeforeScroll);
+
</ins><span class="cx">             if (postScrollCallback)
</span><span class="cx">                 postScrollCallback();
</span><span class="cx">         }
</span><span class="lines">@@ -42,7 +49,8 @@
</span><span class="cx">             var divTarget = document.getElementById('overflowing');
</span><span class="cx">             var divBounds = divTarget.getBoundingClientRect();
</span><span class="cx">             
</span><del>-            logResult('Sending wheel event; scrollTop is ' + divTarget.scrollTop);
</del><ins>+            scrollTopBeforeScroll = divTarget.scrollTop;
+            logResult('Sending mouseWheel events');
</ins><span class="cx"> 
</span><span class="cx">             eventSender.mouseMoveTo(divBounds.left + 10, divBounds.top + 10);
</span><span class="cx">             eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
</span></span></pre>
</div>
</div>

</body>
</html>