<!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>[192124] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192124">192124</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2015-11-06 18:32:13 -0800 (Fri, 06 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Scrolling iframe inside scrollable div does not work with trackpad
https://bugs.webkit.org/show_bug.cgi?id=150168
<rdar://problem/23143931>
Reviewed by Brent Fulgham.
Source/WebCore:
When scrolling in an iframe nested under an overflow scrolling region, EventHandler::platformPrepareForWheelEvents
fails to compute the correct scrollableArea, using the overflow div's scrollable area instead of the iframe's view.
This causes the latching algorithm to bail out of handling the wheel event. To avoid this, we special-case the
decision to compute the scrollableArea from the scrollableContainer if we are attempting to scroll in an iframe.
Test: fast/scrolling/latching/scroll-iframe-in-overflow.html
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::platformPrepareForWheelEvents):
LayoutTests:
Tests that an iframe nested under an overflow scrolling div can be scrolled.
* fast/scrolling/latching/scroll-iframe-in-overflow-expected.txt: Added.
* fast/scrolling/latching/scroll-iframe-in-overflow.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastscrollinglatchingscrolliframeinoverflowexpectedtxt">trunk/LayoutTests/fast/scrolling/latching/scroll-iframe-in-overflow-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastscrollinglatchingscrolliframeinoverflowhtml">trunk/LayoutTests/fast/scrolling/latching/scroll-iframe-in-overflow.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192123 => 192124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-07 01:12:55 UTC (rev 192123)
+++ trunk/LayoutTests/ChangeLog 2015-11-07 02:32:13 UTC (rev 192124)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-11-06 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Scrolling iframe inside scrollable div does not work with trackpad
+ https://bugs.webkit.org/show_bug.cgi?id=150168
+ <rdar://problem/23143931>
+
+ Reviewed by Brent Fulgham.
+
+ Tests that an iframe nested under an overflow scrolling div can be scrolled.
+
+ * fast/scrolling/latching/scroll-iframe-in-overflow-expected.txt: Added.
+ * fast/scrolling/latching/scroll-iframe-in-overflow.html: Added.
+
</ins><span class="cx"> 2015-11-06 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r182286): Tatechuyoko following ruby is drawn too far to the right
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollinglatchingscrolliframeinoverflowexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/latching/scroll-iframe-in-overflow-expected.txt (0 => 192124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/latching/scroll-iframe-in-overflow-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/scrolling/latching/scroll-iframe-in-overflow-expected.txt 2015-11-07 02:32:13 UTC (rev 192124)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS The iframe scrolled but the wrapper did not.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastscrollinglatchingscrolliframeinoverflowhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/latching/scroll-iframe-in-overflow.html (0 => 192124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/latching/scroll-iframe-in-overflow.html (rev 0)
+++ trunk/LayoutTests/fast/scrolling/latching/scroll-iframe-in-overflow.html 2015-11-07 02:32:13 UTC (rev 192124)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+<html>
+<head>
+ <script src="../../../resources/js-test-pre.js"></script>
+ <style type="text/css">
+ #wrapper {
+ height: 400px;
+ width: 600px;
+ overflow: scroll;
+ background-color: #EEE;
+ }
+
+ iframe {
+ background-color: #CCC;
+ width: 400px;
+ height: 100px;
+ margin-bottom: 1000px;
+ }
+
+ body {
+ margin: 0;
+ }
+ </style>
+ <script>
+ window.jsTestIsAsync = true;
+
+ function checkForScroll() {
+ var iframe = document.getElementById("frame");
+ var wrapper = document.getElementById("wrapper");
+ if (iframe.contentWindow.scrollY && !wrapper.scrollTop)
+ testPassed("The iframe scrolled but the wrapper did not.");
+ else
+ testFailed("The iframe's scroll position is: " + iframe.contentWindow.scrollY + ", and the wrapper's scroll position is: " + wrapper.scrollTop);
+
+ testRunner.notifyDone();
+ }
+
+ function scrollTest() {
+ eventSender.mouseMoveTo(200, 50);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, "began", "none");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, "changed", "none");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, "changed", "none");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, "changed", "none");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, "changed", "none");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, "changed", "none");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, "ended", "none");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -10, "none", "begin");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -10, "none", "continue");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -10, "none", "continue");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -10, "none", "continue");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -10, "none", "continue");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -10, "none", "continue");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, "none", "end");
+ eventSender.callAfterScrollingCompletes(checkForScroll);
+ }
+
+ function setup() {
+ if (window.eventSender) {
+ eventSender.monitorWheelEvents();
+ setTimeout(scrollTest, 0);
+ } else {
+ var message = document.createElement("div");
+ message.innerHTML = "<p>This test is better run under DumpRenderTree. To manually test it, place the mouse pointer<br/>"
+ + "inside the IFrame, then use a two-finger swipe to scroll the iframe to the bottom (and beyond).<br/>"
+ + "<br/><br/>"
+ + "The test passes if the overflow container does not scroll but the iframe scrolls to the bottom.</p>";
+ document.body.appendChild(message);
+ }
+ }
+
+ </script>
+</head>
+<body onload="setup()">
+ <div id="wrapper">
+ <iframe id="frame" src="./resources/inner_content.html"></iframe>
+ </div>
+ <script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192123 => 192124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-07 01:12:55 UTC (rev 192123)
+++ trunk/Source/WebCore/ChangeLog 2015-11-07 02:32:13 UTC (rev 192124)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-11-06 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Scrolling iframe inside scrollable div does not work with trackpad
+ https://bugs.webkit.org/show_bug.cgi?id=150168
+ <rdar://problem/23143931>
+
+ Reviewed by Brent Fulgham.
+
+ When scrolling in an iframe nested under an overflow scrolling region, EventHandler::platformPrepareForWheelEvents
+ fails to compute the correct scrollableArea, using the overflow div's scrollable area instead of the iframe's view.
+ This causes the latching algorithm to bail out of handling the wheel event. To avoid this, we special-case the
+ decision to compute the scrollableArea from the scrollableContainer if we are attempting to scroll in an iframe.
+
+ Test: fast/scrolling/latching/scroll-iframe-in-overflow.html
+
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::platformPrepareForWheelEvents):
+
</ins><span class="cx"> 2015-11-06 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Make the result data for a "get" request be an IDBGetResult.
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (192123 => 192124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2015-11-07 01:12:55 UTC (rev 192123)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2015-11-07 02:32:13 UTC (rev 192124)
</span><span class="lines">@@ -932,7 +932,7 @@
</span><span class="cx"> scrollableArea = scrollViewForEventTarget(wheelEventTarget.get());
</span><span class="cx"> } else {
</span><span class="cx"> scrollableContainer = findEnclosingScrollableContainer(wheelEventTarget.get(), wheelEvent.deltaX(), wheelEvent.deltaY());
</span><del>- if (scrollableContainer)
</del><ins>+ if (scrollableContainer && !is<HTMLIFrameElement>(wheelEventTarget.get()))
</ins><span class="cx"> scrollableArea = scrollableAreaForContainerNode(*scrollableContainer);
</span><span class="cx"> else {
</span><span class="cx"> scrollableContainer = view->frame().document()->bodyOrFrameset();
</span></span></pre>
</div>
</div>
</body>
</html>