<!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>[200282] 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/200282">200282</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-04-29 20:54:41 -0700 (Fri, 29 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(194502): overflow: scroll; direction: rtl; divs jump horizontally when scrolled vertically
https://bugs.webkit.org/show_bug.cgi?id=157201
Reviewed by Simon Fraser.
Source/WebCore:
ScrollableArea::scrollToOffsetWithoutAnimation() was mistakenly conflating scroll offsets with
scroll positions.
Test: fast/scrolling/rtl-drag-vertical-scroller.html
* platform/ScrollableArea.cpp:
(WebCore::ScrollableArea::scrollToOffsetWithoutAnimation):
LayoutTests:
* fast/scrolling/rtl-drag-vertical-scroller-expected.txt: Added.
* fast/scrolling/rtl-drag-vertical-scroller.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollableAreacpp">trunk/Source/WebCore/platform/ScrollableArea.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastscrollingrtldragverticalscrollerexpectedtxt">trunk/LayoutTests/fast/scrolling/rtl-drag-vertical-scroller-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastscrollingrtldragverticalscrollerhtml">trunk/LayoutTests/fast/scrolling/rtl-drag-vertical-scroller.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200281 => 200282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-30 03:36:48 UTC (rev 200281)
+++ trunk/LayoutTests/ChangeLog 2016-04-30 03:54:41 UTC (rev 200282)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-04-29 Myles C. Maxfield <mmaxfield@apple.com>
+
+ REGRESSION(194502): overflow: scroll; direction: rtl; divs jump horizontally when scrolled vertically
+ https://bugs.webkit.org/show_bug.cgi?id=157201
+
+ Reviewed by Simon Fraser.
+
+ * fast/scrolling/rtl-drag-vertical-scroller-expected.txt: Added.
+ * fast/scrolling/rtl-drag-vertical-scroller.html: Added.
+
</ins><span class="cx"> 2016-04-29 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Make RegExp.prototype.test spec compliant.
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingrtldragverticalscrollerexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/rtl-drag-vertical-scroller-expected.txt (0 => 200282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/rtl-drag-vertical-scroller-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/scrolling/rtl-drag-vertical-scroller-expected.txt 2016-04-30 03:54:41 UTC (rev 200282)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+This test makes sure that dragging the vertical scrollbar of an RTL scrollable div doesn't cause a horizontal scroll.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS scrollMe.scrollLeft is 0
+PASS scrollMe.scrollTop is not 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Hello
</ins></span></pre></div>
<a id="trunkLayoutTestsfastscrollingrtldragverticalscrollerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/rtl-drag-vertical-scroller.html (0 => 200282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/rtl-drag-vertical-scroller.html (rev 0)
+++ trunk/LayoutTests/fast/scrolling/rtl-drag-vertical-scroller.html 2016-04-30 03:54:41 UTC (rev 200282)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body style="margin: 0px;">
+<div id="scrollMe" style="direction: rtl; width: 100px; height: 100px; position: absolute; left: 0px; top: 0px; overflow: scroll;">
+<div style="position: absolute; right: 300px; top: 300px;">Hello</div>
+<div id="probe" style="position: absolute; right: 0px; top: 0px; width: 1px; height: 1px;"></div>
+</div>
+<script>
+description("This test makes sure that dragging the vertical scrollbar of an RTL scrollable div doesn't cause a horizontal scroll.");
+function detectRTLScrollbar() {
+ var probe = document.getElementById("probe");
+ return probe.getBoundingClientRect().left >= 91;
+}
+
+var rtl = detectRTLScrollbar();
+
+var x;
+if (rtl)
+ x = 4;
+else
+ x = 96;
+
+if (window.eventSender) {
+ eventSender.mouseMoveTo(x, 2);
+ eventSender.mouseDown();
+ eventSender.mouseMoveTo(x, 102);
+ eventSender.mouseUp();
+}
+var scrollMe = document.getElementById("scrollMe");
+shouldBe("scrollMe.scrollLeft", "0");
+shouldNotBe("scrollMe.scrollTop", "0");
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (200281 => 200282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-04-30 03:36:48 UTC (rev 200281)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-04-30 03:54:41 UTC (rev 200282)
</span><span class="lines">@@ -3013,3 +3013,6 @@
</span><span class="cx"> fast/images/image-map-outline-with-scale-transform.html [ Pass ImageOnlyFailure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/156812 compositing/webgl/webgl-reflection.html [ Failure ]
</span><ins>+
+# iOS does not allow you to scroll by dragging the scrollbar thumb.
+webkit.org/b/157201 fast/scrolling/rtl-drag-vertical-scroller.html [ Failure ]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200281 => 200282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-30 03:36:48 UTC (rev 200281)
+++ trunk/Source/WebCore/ChangeLog 2016-04-30 03:54:41 UTC (rev 200282)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-04-29 Myles C. Maxfield <mmaxfield@apple.com>
+
+ REGRESSION(194502): overflow: scroll; direction: rtl; divs jump horizontally when scrolled vertically
+ https://bugs.webkit.org/show_bug.cgi?id=157201
+
+ Reviewed by Simon Fraser.
+
+ ScrollableArea::scrollToOffsetWithoutAnimation() was mistakenly conflating scroll offsets with
+ scroll positions.
+
+ Test: fast/scrolling/rtl-drag-vertical-scroller.html
+
+ * platform/ScrollableArea.cpp:
+ (WebCore::ScrollableArea::scrollToOffsetWithoutAnimation):
+
</ins><span class="cx"> 2016-04-29 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up GraphicsContext use in RenderLayer::paintLayerContents()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.cpp (200281 => 200282)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.cpp 2016-04-30 03:36:48 UTC (rev 200281)
+++ trunk/Source/WebCore/platform/ScrollableArea.cpp 2016-04-30 03:54:41 UTC (rev 200282)
</span><span class="lines">@@ -149,10 +149,11 @@
</span><span class="cx">
</span><span class="cx"> void ScrollableArea::scrollToOffsetWithoutAnimation(ScrollbarOrientation orientation, float offset)
</span><span class="cx"> {
</span><ins>+ auto currentOffset = scrollOffsetFromPosition(IntPoint(scrollAnimator().currentPosition()));
</ins><span class="cx"> if (orientation == HorizontalScrollbar)
</span><del>- scrollToOffsetWithoutAnimation(FloatPoint(offset, scrollAnimator().currentPosition().y()));
</del><ins>+ scrollToOffsetWithoutAnimation(FloatPoint(offset, currentOffset.y()));
</ins><span class="cx"> else
</span><del>- scrollToOffsetWithoutAnimation(FloatPoint(scrollAnimator().currentPosition().x(), offset));
</del><ins>+ scrollToOffsetWithoutAnimation(FloatPoint(currentOffset.x(), offset));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollableArea::notifyScrollPositionChanged(const ScrollPosition& position)
</span></span></pre>
</div>
</div>
</body>
</html>