<!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>[194004] 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/194004">194004</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-12-11 22:58:15 -0800 (Fri, 11 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Mousewheel events don't work in iframes in RTL documents
https://bugs.webkit.org/show_bug.cgi?id=152200
Reviewed by Beth Dakin.
Source/WebCore:
When dispatching wheel events, the testing of the event point against the
non-fast scrollable region was broken in an RTL document. Fix by taking
the scrollOrigin into account in ScrollingTreeFrameScrollingNode::viewToContentsOffset().
Test: fast/scrolling/rtl-point-in-iframe.html
* page/scrolling/ScrollingTreeFrameScrollingNode.cpp:
(WebCore::ScrollingTreeFrameScrollingNode::viewToContentsOffset):
LayoutTests:
Try dispatching wheel events to an iframe in an RTL document.
* fast/scrolling/rtl-point-in-iframe-expected.txt: Added.
* fast/scrolling/rtl-point-in-iframe.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="#trunkSourceWebCorepagescrollingScrollingTreeFrameScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastscrollingrtlpointiniframeexpectedtxt">trunk/LayoutTests/fast/scrolling/rtl-point-in-iframe-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastscrollingrtlpointiniframehtml">trunk/LayoutTests/fast/scrolling/rtl-point-in-iframe.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194003 => 194004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-12 06:10:07 UTC (rev 194003)
+++ trunk/LayoutTests/ChangeLog 2015-12-12 06:58:15 UTC (rev 194004)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-12-11 Simon Fraser <simon.fraser@apple.com>
+
+ Mousewheel events don't work in iframes in RTL documents
+ https://bugs.webkit.org/show_bug.cgi?id=152200
+
+ Reviewed by Beth Dakin.
+
+ Try dispatching wheel events to an iframe in an RTL document.
+
+ * fast/scrolling/rtl-point-in-iframe-expected.txt: Added.
+ * fast/scrolling/rtl-point-in-iframe.html: Added.
+
</ins><span class="cx"> 2015-12-11 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: !rect.isEmpty() in WebCore::GraphicsContext::drawRect
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingrtlpointiniframeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/rtl-point-in-iframe-expected.txt (0 => 194004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/rtl-point-in-iframe-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/scrolling/rtl-point-in-iframe-expected.txt 2015-12-12 06:58:15 UTC (rev 194004)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+PASS iframe received wheel events.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastscrollingrtlpointiniframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/rtl-point-in-iframe.html (0 => 194004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/rtl-point-in-iframe.html (rev 0)
+++ trunk/LayoutTests/fast/scrolling/rtl-point-in-iframe.html 2015-12-12 06:58:15 UTC (rev 194004)
</span><span class="lines">@@ -0,0 +1,89 @@
</span><ins>+<!DOCTYPE html>
+<html dir="rtl">
+<head>
+ <link rel="stylesheet" href="resources/scrollable-style.css">
+ <script src="../../resources/js-test-pre.js"></script>
+ <style>
+ .origin {
+ position: absolute;
+ top: 0;
+ left: 0;
+ height: 10px;
+ width: 10px;
+ background-color: blue;
+ }
+
+ .wide {
+ width: 1200px;
+ height: 10px;
+ background-color: silver;
+ }
+ iframe {
+ position: absolute;
+ }
+ </style>
+ <script>
+ var pageScrollPositionBefore;
+ var iframeScrollPositionBefore;
+
+ function checkForScroll()
+ {
+ // The iframe should have scrolled, but not the main page.
+ var iframeScrollPositionAfter = window.frames['target'].document.body.scrollTop;
+
+ if (iframeScrollPositionBefore != iframeScrollPositionAfter)
+ testPassed("iframe received wheel events.");
+ else
+ testFailed("iframe did not receive wheel events.");
+
+ testRunner.notifyDone();
+ }
+
+ function scrollTest()
+ {
+ pageScrollPositionBefore = document.body.scrollTop;
+
+ var iframeTarget = document.getElementById('target');
+ iframeScrollPositionBefore = iframeTarget.contentDocument.body.scrollTop;
+
+ var startPosX = iframeTarget.offsetLeft + 20;
+ var startPosY = iframeTarget.offsetTop + 20;
+ 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, 0, 'none', 'end');
+ setTimeout(checkForScroll, 100);
+ }
+
+ function startTest()
+ {
+ if (window.eventSender) {
+ testRunner.waitUntilDone();
+ setTimeout(scrollTest, 0);
+ }
+ }
+
+ window.addEventListener('load', startTest, false);
+ </script>
+</head>
+<body>
+ <div class="wide">
+ <div class="origin"></div>
+
+ <iframe id="target" name="target" style="border:solid 1px green; height: 300px; width: 300px;"
+ src= "data:text/html,
+ <html>
+ <head>
+ <style>div { width: 400px; height: 1000px; background-color: green; } </style>
+ </head>
+ <body>
+ <div></div>
+ </body>
+ </html>">
+ </iframe>
+ <div id='console'></div>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194003 => 194004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-12 06:10:07 UTC (rev 194003)
+++ trunk/Source/WebCore/ChangeLog 2015-12-12 06:58:15 UTC (rev 194004)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-12-11 Simon Fraser <simon.fraser@apple.com>
+
+ Mousewheel events don't work in iframes in RTL documents
+ https://bugs.webkit.org/show_bug.cgi?id=152200
+
+ Reviewed by Beth Dakin.
+
+ When dispatching wheel events, the testing of the event point against the
+ non-fast scrollable region was broken in an RTL document. Fix by taking
+ the scrollOrigin into account in ScrollingTreeFrameScrollingNode::viewToContentsOffset().
+
+ Test: fast/scrolling/rtl-point-in-iframe.html
+
+ * page/scrolling/ScrollingTreeFrameScrollingNode.cpp:
+ (WebCore::ScrollingTreeFrameScrollingNode::viewToContentsOffset):
+
</ins><span class="cx"> 2015-12-11 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: !rect.isEmpty() in WebCore::GraphicsContext::drawRect
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeFrameScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp (194003 => 194004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp 2015-12-12 06:10:07 UTC (rev 194003)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp 2015-12-12 06:58:15 UTC (rev 194004)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> FloatSize ScrollingTreeFrameScrollingNode::viewToContentsOffset(const FloatPoint& scrollOffset) const
</span><span class="cx"> {
</span><del>- return toFloatSize(scrollOffset) - FloatSize(0, headerHeight() + topContentInset());
</del><ins>+ return toFloatSize(scrollOffset) - toFloatSize(scrollOrigin()) - FloatSize(0, headerHeight() + topContentInset());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>