<!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>[185211] 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/185211">185211</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-06-04 12:33:19 -0700 (Thu, 04 Jun 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add WK1 versions of tests from Bugs 145637 and 145642
https://bugs.webkit.org/show_bug.cgi?id=145649

Reviewed by Zalan Bujtas.

* platform/mac/fast/scrolling/iframe_in_iframe-expected.txt: Added.
* platform/mac/fast/scrolling/iframe_in_iframe.html: Added.
* platform/mac/fast/scrolling/resources/inner_content.html: Added.
* platform/mac/fast/scrolling/resources/testContent.html: Added.
* platform/mac/fast/scrolling/resources/testImage.png: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacfastscrollingiframe_in_iframeexpectedtxt">trunk/LayoutTests/platform/mac/fast/scrolling/iframe_in_iframe-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastscrollingiframe_in_iframehtml">trunk/LayoutTests/platform/mac/fast/scrolling/iframe_in_iframe.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastscrollingresourcesinner_contenthtml">trunk/LayoutTests/platform/mac/fast/scrolling/resources/inner_content.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastscrollingresourcestestContenthtml">trunk/LayoutTests/platform/mac/fast/scrolling/resources/testContent.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastscrollingresourcestestImagepng">trunk/LayoutTests/platform/mac/fast/scrolling/resources/testImage.png</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185210 => 185211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-06-04 19:17:16 UTC (rev 185210)
+++ trunk/LayoutTests/ChangeLog        2015-06-04 19:33:19 UTC (rev 185211)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-06-04  Brent Fulgham  &lt;bfulgham@apple.com&gt;
+
+        Add WK1 versions of tests from Bugs 145637 and 145642
+        https://bugs.webkit.org/show_bug.cgi?id=145649
+
+        Reviewed by Zalan Bujtas.
+
+        * platform/mac/fast/scrolling/iframe_in_iframe-expected.txt: Added.
+        * platform/mac/fast/scrolling/iframe_in_iframe.html: Added.
+        * platform/mac/fast/scrolling/resources/inner_content.html: Added.
+        * platform/mac/fast/scrolling/resources/testContent.html: Added.
+        * platform/mac/fast/scrolling/resources/testImage.png: Added.
+
</ins><span class="cx"> 2015-06-04  Youenn Fablet  &lt;youenn.fablet@crf.canon.fr&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION: streams/reference-implementation/readable-stream-templated.html is flaky
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastscrollingiframe_in_iframeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/scrolling/iframe_in_iframe-expected.txt (0 => 185211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/scrolling/iframe_in_iframe-expected.txt                                (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/scrolling/iframe_in_iframe-expected.txt        2015-06-04 19:33:19 UTC (rev 185211)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Inner Frame:
+
+Tests that iframe doesn't pass wheel events to main frame when scrolling inside iframe
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+PASS Page did not receive wheel events.
+PASS iframe did not receive wheel events.
+PASS iframe received wheel events.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastscrollingiframe_in_iframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/scrolling/iframe_in_iframe.html (0 => 185211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/scrolling/iframe_in_iframe.html                                (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/scrolling/iframe_in_iframe.html        2015-06-04 19:33:19 UTC (rev 185211)
</span><span class="lines">@@ -0,0 +1,114 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+    &lt;head&gt;
+        &lt;title&gt;iFrame in iFrame Test&lt;/title&gt;
+        &lt;style&gt;
+        * {
+            box-sizing: border-box;
+        }
+
+        .container {
+            width:100%;
+            overflow:auto;
+            height:auto;
+        }
+
+        .innercontainer {
+            height:100%;
+            width:50%;
+        }
+        &lt;/style&gt;
+        &lt;script src=&quot;../../../../resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
+    &lt;/head&gt;
+    &lt;body&gt;
+&lt;script&gt;
+
+var iframeTarget;
+var innerIFrameTarget;
+var pageScrollPositionBefore;
+var iFrameScrollPositionBefore;
+var continueCount = 5;
+
+function checkForScroll()
+{
+    // The IFrame should not have scrolled at all.
+    var pageScrollPositionAfter = document.body.scrollTop;
+    var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop;
+    var innerIFrameScrollPositionAfter = iframeTarget.contentWindow.frames['target'].document.body.scrollTop;
+
+    if (pageScrollPositionBefore != pageScrollPositionAfter)
+        testFailed(&quot;Page received wheel events.&quot;);
+    else
+        testPassed(&quot;Page did not receive wheel events.&quot;);
+
+    if (iFrameScrollPositionBefore != iFrameScrollPositionAfter)
+        testFailed(&quot;iframe received wheel events.&quot;);
+    else
+        testPassed(&quot;iframe did not receive wheel events.&quot;);
+
+    if (innerIFrameScrollPositionBefore != innerIFrameScrollPositionAfter)
+        testPassed(&quot;iframe received wheel events.&quot;);
+    else
+        testFailed(&quot;iframe did not receive wheel events.&quot;);
+
+    finishJSTest();
+    testRunner.notifyDone();
+}
+
+function scrollTest()
+{
+    pageScrollPositionBefore = document.body.scrollTop;
+
+    iframeTarget = document.getElementById('target');
+
+    var iFrameBody = window.frames['target'].document.body;
+    iFrameScrollPositionBefore = iFrameBody.scrollTop;
+
+    innerIFrameTarget = iframeTarget.contentWindow.frames['target'].document.body;
+    innerIFrameScrollPositionBefore = innerIFrameTarget.scrollTop;
+
+    // Scroll the #source until we reach the #target.
+    var startPosX = Math.round(iframeTarget.offsetLeft) + 20;
+    var startPosY = Math.round(iframeTarget.offsetTop) + 80;
+    eventSender.mouseMoveTo(startPosX, startPosY);
+    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
+    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
+    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
+    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none');
+    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin');
+    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
+    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
+    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
+    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue');
+    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
+    eventSender.callAfterScrollingCompletes(checkForScroll);
+}
+
+function setupTopLevel()
+{
+    if (window.eventSender) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
+
+        eventSender.monitorWheelEvents();
+        setTimeout(scrollTest, 0);
+    }
+}
+&lt;/script&gt;
+        &lt;div class=&quot;container&quot;&gt;
+            &lt;div class=&quot;innercontainer&quot;&gt;
+                &lt;div style=&quot;width:100%;&quot;&gt;
+                    &lt;div&gt;Inner Frame:&lt;/div&gt;
+                    &lt;div style=&quot;height:92%;&quot;&gt;
+                        &lt;iframe id=&quot;target&quot; name=&quot;target&quot; src=&quot;resources/testContent.html&quot; onload=&quot;setupTopLevel();&quot;&gt;&lt;/iframe&gt;
+                    &lt;/div&gt;
+                &lt;/div&gt;
+            &lt;/div&gt;
+        &lt;/div&gt;
+        &lt;div id=&quot;console&quot;&gt;&lt;/div&gt;
+        &lt;script&gt;
+        description(&quot;Tests that iframe doesn't pass wheel events to main frame when scrolling inside iframe&quot;);
+        &lt;/script&gt;
+        &lt;script src=&quot;../../../../resources/js-test-post.js&quot;&gt;&lt;/script&gt;
+    &lt;/body&gt;
+&lt;/html&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastscrollingresourcesinner_contenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/scrolling/resources/inner_content.html (0 => 185211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/scrolling/resources/inner_content.html                                (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/scrolling/resources/inner_content.html        2015-06-04 19:33:19 UTC (rev 185211)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html lang=&quot;en-US&quot;&gt;
+    &lt;head&gt;
+        &lt;title&gt;Inner iFrame Example&lt;/title&gt;
+        &lt;meta charset=&quot;utf-8&quot;&gt;
+    &lt;/head&gt;
+    &lt;body style=&quot;position: relative; min-height: 100%; top: 0px;&quot;&gt;
+        &lt;div style=&quot;overflow:auto;&quot;&gt;
+            &lt;img src=&quot;testImage.png&quot;&gt;
+            &lt;div&gt;TEST CASE TEST CASE TEST CASE TEST CASE&lt;/div&gt;
+        &lt;/div&gt;
+        &lt;div style=&quot;overflow:auto;&quot;&gt;
+            &lt;h1&gt;TEST HEADING&lt;/h1&gt;
+            &lt;p&gt;Test paragraph.&lt;/p&gt;
+            &lt;div&gt;TEST BUTTON 1&lt;/div&gt;
+            &lt;div&gt;TEST BUTTON 2&lt;/div&gt;      
+        &lt;/div&gt;
+    &lt;/body&gt;
+&lt;/html&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastscrollingresourcestestContenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/scrolling/resources/testContent.html (0 => 185211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/scrolling/resources/testContent.html                                (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/scrolling/resources/testContent.html        2015-06-04 19:33:19 UTC (rev 185211)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;body&gt;
+
+&lt;p&gt;An iframe where scrollbars are always shown:&lt;/p&gt;
+&lt;iframe id=&quot;target&quot; name=&quot;target&quot; src=&quot;./inner_content.html&quot; width=&quot;200&quot; height=&quot;200&quot; scrolling=&quot;yes&quot;&gt;
+  &lt;p&gt;Your browser does not support iframes.&lt;/p&gt;
+&lt;/iframe&gt;
+
+&lt;p&gt;An iframe where scrollbars are never shown:&lt;/p&gt;
+&lt;iframe src=&quot;./inner_content.html&quot; width=&quot;200&quot; height=&quot;200&quot; scrolling=&quot;no&quot;&gt;
+  &lt;p&gt;Your browser does not support iframes.&lt;/p&gt;
+&lt;/iframe&gt;
+
+&lt;p&gt;The scrolling attribute is not supported in HTML5. Use CSS instead.&lt;/p&gt;
+
+&lt;/body&gt;
+&lt;/html&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastscrollingresourcestestImagepng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/fast/scrolling/resources/testImage.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/fast/scrolling/resources/testImage.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
</div>

</body>
</html>