<!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>[194514] 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/194514">194514</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-01-03 10:06:50 -0800 (Sun, 03 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>scrollLeft returns different values for viewport and non-viewport scrolling with rtl
https://bugs.webkit.org/show_bug.cgi?id=94405
rdar://problem/21829754
Reviewed by Zalan Bujtas.
Source/WebCore:
Use scrollPosition for DOM-exposed scroll* values on overflow scroll elements,
matching the CSS OM View spec, and Gecko behavior.
Test: fast/scrolling/programmatic-overflow-rtl-scrollIntoView.html
* rendering/RenderBox.cpp:
(WebCore::RenderBox::scrollLeft):
(WebCore::RenderBox::scrollTop):
(WebCore::RenderBox::setScrollLeft):
(WebCore::RenderBox::setScrollTop):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollToXPosition):
(WebCore::RenderLayer::scrollToYPosition):
* rendering/RenderLayer.h:
LayoutTests:
programmatic-overflow-rtl-scrollIntoView.html is a basic test for negative scrollLeft
in an RTL scroller.
Other tests are fixed to programmatically scroll to negative scroll positions.
* compositing/rtl/rtl-overflow-scrolling.html:
* fast/overflow/scroll-div-hide-show-expected.txt:
* fast/overflow/scroll-div-hide-show.html:
* fast/repaint/horizontal-bt-overflow-parent.html:
* fast/repaint/horizontal-bt-overflow-same.html:
* fast/repaint/vertical-overflow-parent.html:
* fast/repaint/vertical-overflow-same.html:
* fast/scrolling/programmatic-overflow-rtl-scrollIntoView-expected.txt: Added.
* fast/scrolling/programmatic-overflow-rtl-scrollIntoView.html: Added.
* fast/writing-mode/flipped-blocks-hit-test-overflow-scroll.html:
* imported/blink/compositing/overflow/rtl-overflow.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscompositingrtlrtloverflowscrollinghtml">trunk/LayoutTests/compositing/rtl/rtl-overflow-scrolling.html</a></li>
<li><a href="#trunkLayoutTestsfastoverflowscrolldivhideshowexpectedtxt">trunk/LayoutTests/fast/overflow/scroll-div-hide-show-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastoverflowscrolldivhideshowhtml">trunk/LayoutTests/fast/overflow/scroll-div-hide-show.html</a></li>
<li><a href="#trunkLayoutTestsfastrepainthorizontalbtoverflowparenthtml">trunk/LayoutTests/fast/repaint/horizontal-bt-overflow-parent.html</a></li>
<li><a href="#trunkLayoutTestsfastrepainthorizontalbtoverflowsamehtml">trunk/LayoutTests/fast/repaint/horizontal-bt-overflow-same.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintverticaloverflowparenthtml">trunk/LayoutTests/fast/repaint/vertical-overflow-parent.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintverticaloverflowsamehtml">trunk/LayoutTests/fast/repaint/vertical-overflow-same.html</a></li>
<li><a href="#trunkLayoutTestsfastwritingmodeflippedblockshittestoverflowscrollhtml">trunk/LayoutTests/fast/writing-mode/flipped-blocks-hit-test-overflow-scroll.html</a></li>
<li><a href="#trunkLayoutTestsimportedblinkcompositingoverflowrtloverflowhtml">trunk/LayoutTests/imported/blink/compositing/overflow/rtl-overflow.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastscrollingprogrammaticoverflowrtlscrollIntoViewexpectedtxt">trunk/LayoutTests/fast/scrolling/programmatic-overflow-rtl-scrollIntoView-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastscrollingprogrammaticoverflowrtlscrollIntoViewhtml">trunk/LayoutTests/fast/scrolling/programmatic-overflow-rtl-scrollIntoView.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194513 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-03 16:56:02 UTC (rev 194513)
+++ trunk/LayoutTests/ChangeLog 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-01-03 Simon Fraser <simon.fraser@apple.com>
+
+ scrollLeft returns different values for viewport and non-viewport scrolling with rtl
+ https://bugs.webkit.org/show_bug.cgi?id=94405
+ rdar://problem/21829754
+
+ Reviewed by Zalan Bujtas.
+
+ programmatic-overflow-rtl-scrollIntoView.html is a basic test for negative scrollLeft
+ in an RTL scroller.
+
+ Other tests are fixed to programmatically scroll to negative scroll positions.
+
+ * compositing/rtl/rtl-overflow-scrolling.html:
+ * fast/overflow/scroll-div-hide-show-expected.txt:
+ * fast/overflow/scroll-div-hide-show.html:
+ * fast/repaint/horizontal-bt-overflow-parent.html:
+ * fast/repaint/horizontal-bt-overflow-same.html:
+ * fast/repaint/vertical-overflow-parent.html:
+ * fast/repaint/vertical-overflow-same.html:
+ * fast/scrolling/programmatic-overflow-rtl-scrollIntoView-expected.txt: Added.
+ * fast/scrolling/programmatic-overflow-rtl-scrollIntoView.html: Added.
+ * fast/writing-mode/flipped-blocks-hit-test-overflow-scroll.html:
+ * imported/blink/compositing/overflow/rtl-overflow.html:
+
</ins><span class="cx"> 2016-01-02 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Some cleanup in ScrollAnimator
</span></span></pre></div>
<a id="trunkLayoutTestscompositingrtlrtloverflowscrollinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/compositing/rtl/rtl-overflow-scrolling.html (194513 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/rtl/rtl-overflow-scrolling.html 2016-01-03 16:56:02 UTC (rev 194513)
+++ trunk/LayoutTests/compositing/rtl/rtl-overflow-scrolling.html 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
</span><span class="cx">
</span><span class="cx"> function runTest() {
</span><del>- document.getElementById("container").scrollLeft = 0;
</del><ins>+ document.getElementById("container").scrollLeft = -715;
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> <style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastoverflowscrolldivhideshowexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/overflow/scroll-div-hide-show-expected.txt (194513 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/overflow/scroll-div-hide-show-expected.txt 2016-01-03 16:56:02 UTC (rev 194513)
+++ trunk/LayoutTests/fast/overflow/scroll-div-hide-show-expected.txt 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -53,13 +53,13 @@
</span><span class="cx"> PASS e.scrollLeft is 0
</span><span class="cx">
</span><span class="cx"> Testing that scroll position is restored for RTL texts
</span><del>-Scrolling to 50, 150
</del><ins>+Scrolling to -50, 150
</ins><span class="cx"> Div's display is none now
</span><span class="cx"> PASS e.scrollTop is 0
</span><span class="cx"> PASS e.scrollLeft is 0
</span><span class="cx"> Div's display is block again
</span><span class="cx"> PASS e.scrollTop is 150
</span><del>-PASS e.scrollLeft is 50
</del><ins>+PASS e.scrollLeft is -50
</ins><span class="cx">
</span><span class="cx"> Test iframe scrolling
</span><span class="cx"> Scrolling Iframe to (50, 75)
</span></span></pre></div>
<a id="trunkLayoutTestsfastoverflowscrolldivhideshowhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/overflow/scroll-div-hide-show.html (194513 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/overflow/scroll-div-hide-show.html 2016-01-03 16:56:02 UTC (rev 194513)
+++ trunk/LayoutTests/fast/overflow/scroll-div-hide-show.html 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -138,9 +138,9 @@
</span><span class="cx">
</span><span class="cx"> e.dir="rtl";
</span><span class="cx">
</span><del>-debug("Scrolling to 50, 150");
</del><ins>+debug("Scrolling to -50, 150");
</ins><span class="cx"> e.scrollTop = 150;
</span><del>-e.scrollLeft = 50;
</del><ins>+e.scrollLeft = -50;
</ins><span class="cx"> debug("Div's display is none now");
</span><span class="cx"> e.style.display = 'none';
</span><span class="cx"> shouldBe('e.scrollTop', '0');
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> debug("Div's display is block again");
</span><span class="cx"> e.style.display = 'block';
</span><span class="cx"> shouldBe('e.scrollTop', '150');
</span><del>-shouldBe('e.scrollLeft', '50');
</del><ins>+shouldBe('e.scrollLeft', '-50');
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test iframe scrolling");
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepainthorizontalbtoverflowparenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/horizontal-bt-overflow-parent.html (194513 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/horizontal-bt-overflow-parent.html 2016-01-03 16:56:02 UTC (rev 194513)
+++ trunk/LayoutTests/fast/repaint/horizontal-bt-overflow-parent.html 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> target.style.visibility = "visible";
</span><span class="cx"> };
</span><span class="cx"> var container = document.getElementsByClassName("container")[0];
</span><del>- container.scrollTop = 0;
</del><ins>+ container.scrollTop = -1915;
</ins><span class="cx"> runRepaintTest();
</span><span class="cx"> </script>
</span><span class="cx"> </body></html>
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepainthorizontalbtoverflowsamehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/horizontal-bt-overflow-same.html (194513 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/horizontal-bt-overflow-same.html 2016-01-03 16:56:02 UTC (rev 194513)
+++ trunk/LayoutTests/fast/repaint/horizontal-bt-overflow-same.html 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> target.style.visibility = "visible";
</span><span class="cx"> };
</span><span class="cx"> var container = document.getElementsByClassName("container")[0];
</span><del>- container.scrollTop = 0;
</del><ins>+ container.scrollTop = -1915;
</ins><span class="cx"> runRepaintTest();
</span><span class="cx"> </script>
</span><span class="cx"> </body></html>
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintverticaloverflowparenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/vertical-overflow-parent.html (194513 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/vertical-overflow-parent.html 2016-01-03 16:56:02 UTC (rev 194513)
+++ trunk/LayoutTests/fast/repaint/vertical-overflow-parent.html 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> target.style.visibility = "visible";
</span><span class="cx"> };
</span><span class="cx"> var container = document.getElementsByClassName("container")[0];
</span><del>- container.scrollLeft = 0;
</del><ins>+ container.scrollLeft = -1815;
</ins><span class="cx"> runRepaintTest();
</span><span class="cx"> </script>
</span><span class="cx"> </body></html>
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintverticaloverflowsamehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/vertical-overflow-same.html (194513 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/vertical-overflow-same.html 2016-01-03 16:56:02 UTC (rev 194513)
+++ trunk/LayoutTests/fast/repaint/vertical-overflow-same.html 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> target.style.visibility = "visible";
</span><span class="cx"> };
</span><span class="cx"> var container = document.getElementsByClassName("container")[0];
</span><del>- container.scrollLeft = 0;
</del><ins>+ container.scrollLeft = -1815;
</ins><span class="cx"> runRepaintTest();
</span><span class="cx"> </script>
</span><span class="cx"> </body></html>
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingprogrammaticoverflowrtlscrollIntoViewexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/programmatic-overflow-rtl-scrollIntoView-expected.txt (0 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/programmatic-overflow-rtl-scrollIntoView-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/scrolling/programmatic-overflow-rtl-scrollIntoView-expected.txt 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS: scrollLeft was -200
</ins></span></pre></div>
<a id="trunkLayoutTestsfastscrollingprogrammaticoverflowrtlscrollIntoViewhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/programmatic-overflow-rtl-scrollIntoView.html (0 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/programmatic-overflow-rtl-scrollIntoView.html (rev 0)
+++ trunk/LayoutTests/fast/scrolling/programmatic-overflow-rtl-scrollIntoView.html 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<html>
+<head>
+ <style>
+ #scrollable {
+ position: relative;
+ width: 200px;
+ height: 200px;
+ overflow: hidden;
+ outline: 1px solid black;
+ margin: 20px;
+ }
+
+ #lefty {
+ position: absolute;
+ left: -200px;
+ width: 100px;
+ height: 100px;
+ background-color: orange;
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ function runTest()
+ {
+ document.getElementById('lefty').scrollIntoView();
+ var expectedScrollLeft = -200;
+ var actualScrollLeft = document.getElementById('scrollable').scrollLeft;
+ if (expectedScrollLeft == actualScrollLeft)
+ document.getElementById('result').textContent = "PASS: scrollLeft was " + actualScrollLeft;
+ else
+ document.getElementById('result').textContent = "FAIL: expected scrollLeft to be " + expectedScrollLeft + ", was " + actualScrollLeft;
+ }
+
+ window.addEventListener('load', runTest, false);
+ </script>
+</head>
+<body>
+ <div id="scrollable" dir="rtl">
+ <div id="lefty"></div>
+ </div>
+ <div id="result">
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastwritingmodeflippedblockshittestoverflowscrollhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/writing-mode/flipped-blocks-hit-test-overflow-scroll.html (194513 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/writing-mode/flipped-blocks-hit-test-overflow-scroll.html 2016-01-03 16:56:02 UTC (rev 194513)
+++ trunk/LayoutTests/fast/writing-mode/flipped-blocks-hit-test-overflow-scroll.html 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx">
</span><span class="cx"> var scrollable = document.getElementById("scrollable");
</span><del>- scrollable.scrollTop = 40;
</del><ins>+ scrollable.scrollTop = -60;
</ins><span class="cx"> var target = document.getElementById("target");
</span><span class="cx"> var hitContainer = document.caretRangeFromPoint(208, 58).startContainer;
</span><span class="cx"> document.getElementById("result").innerText = hitContainer === target ? "PASS" : "FAIL";
</span></span></pre></div>
<a id="trunkLayoutTestsimportedblinkcompositingoverflowrtloverflowhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/blink/compositing/overflow/rtl-overflow.html (194513 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/blink/compositing/overflow/rtl-overflow.html 2016-01-03 16:56:02 UTC (rev 194513)
+++ trunk/LayoutTests/imported/blink/compositing/overflow/rtl-overflow.html 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> <script>
</span><del>- document.getElementById('second').scrollLeft = 0;
</del><ins>+ document.getElementById('second').scrollLeft = -600;
</ins><span class="cx"> </script>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194513 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-03 16:56:02 UTC (rev 194513)
+++ trunk/Source/WebCore/ChangeLog 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2016-01-03 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ scrollLeft returns different values for viewport and non-viewport scrolling with rtl
+ https://bugs.webkit.org/show_bug.cgi?id=94405
+ rdar://problem/21829754
+
+ Reviewed by Zalan Bujtas.
+
+ Use scrollPosition for DOM-exposed scroll* values on overflow scroll elements,
+ matching the CSS OM View spec, and Gecko behavior.
+
+ Test: fast/scrolling/programmatic-overflow-rtl-scrollIntoView.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::scrollLeft):
+ (WebCore::RenderBox::scrollTop):
+ (WebCore::RenderBox::setScrollLeft):
+ (WebCore::RenderBox::setScrollTop):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollToXPosition):
+ (WebCore::RenderLayer::scrollToYPosition):
+ * rendering/RenderLayer.h:
+
+2016-01-03 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Some cleanup in ScrollAnimator
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152649
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (194513 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-01-03 16:56:02 UTC (rev 194513)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -578,12 +578,12 @@
</span><span class="cx">
</span><span class="cx"> int RenderBox::scrollLeft() const
</span><span class="cx"> {
</span><del>- return hasOverflowClip() && layer() ? layer()->scrollOffset().x() : 0;
</del><ins>+ return hasOverflowClip() && layer() ? layer()->scrollPosition().x() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderBox::scrollTop() const
</span><span class="cx"> {
</span><del>- return hasOverflowClip() && layer() ? layer()->scrollOffset().y() : 0;
</del><ins>+ return hasOverflowClip() && layer() ? layer()->scrollPosition().y() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void setupWheelEventTestTrigger(RenderLayer& layer, Frame* frame)
</span><span class="lines">@@ -603,7 +603,7 @@
</span><span class="cx"> if (!hasOverflowClip() || !layer())
</span><span class="cx"> return;
</span><span class="cx"> setupWheelEventTestTrigger(*layer(), document().frame());
</span><del>- layer()->scrollToXOffset(newLeft, RenderLayer::ScrollOffsetClamped);
</del><ins>+ layer()->scrollToXPosition(newLeft, RenderLayer::ScrollOffsetClamped);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBox::setScrollTop(int newTop)
</span><span class="lines">@@ -611,7 +611,7 @@
</span><span class="cx"> if (!hasOverflowClip() || !layer())
</span><span class="cx"> return;
</span><span class="cx"> setupWheelEventTestTrigger(*layer(), document().frame());
</span><del>- layer()->scrollToYOffset(newTop, RenderLayer::ScrollOffsetClamped);
</del><ins>+ layer()->scrollToYPosition(newTop, RenderLayer::ScrollOffsetClamped);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBox::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (194513 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-01-03 16:56:02 UTC (rev 194513)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -2314,6 +2314,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderLayer::scrollToXPosition(int x, ScrollOffsetClamping clamp)
+{
+ ScrollPosition position(x, m_scrollPosition.y());
+ scrollToOffset(scrollOffsetFromPosition(position), clamp);
+}
+
+void RenderLayer::scrollToYPosition(int y, ScrollOffsetClamping clamp)
+{
+ ScrollPosition position(m_scrollPosition.x(), y);
+ scrollToOffset(scrollOffsetFromPosition(position), clamp);
+}
+
</ins><span class="cx"> ScrollOffset RenderLayer::clampScrollOffset(const ScrollOffset& scrollOffset) const
</span><span class="cx"> {
</span><span class="cx"> return scrollOffset.constrainedBetween(IntPoint(), maximumScrollOffset());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (194513 => 194514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2016-01-03 16:56:02 UTC (rev 194513)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2016-01-03 18:06:50 UTC (rev 194514)
</span><span class="lines">@@ -197,6 +197,9 @@
</span><span class="cx"> void scrollToXOffset(int x, ScrollOffsetClamping clamp = ScrollOffsetUnclamped) { scrollToOffset(ScrollOffset(x, scrollOffset().y()), clamp); }
</span><span class="cx"> void scrollToYOffset(int y, ScrollOffsetClamping clamp = ScrollOffsetUnclamped) { scrollToOffset(ScrollOffset(scrollOffset().x(), y), clamp); }
</span><span class="cx">
</span><ins>+ void scrollToXPosition(int x, ScrollOffsetClamping = ScrollOffsetUnclamped);
+ void scrollToYPosition(int y, ScrollOffsetClamping = ScrollOffsetUnclamped);
+
</ins><span class="cx"> ScrollOffset scrollOffset() const { return scrollOffsetFromPosition(m_scrollPosition); }
</span><span class="cx"> IntSize scrollableContentsSize() const;
</span><span class="cx">
</span><span class="lines">@@ -216,6 +219,8 @@
</span><span class="cx"> bool hasVerticalScrollbar() const { return verticalScrollbar(); }
</span><span class="cx">
</span><span class="cx"> // ScrollableArea overrides
</span><ins>+ virtual ScrollPosition scrollPosition() const override { return m_scrollPosition; }
+
</ins><span class="cx"> virtual Scrollbar* horizontalScrollbar() const override { return m_hBar.get(); }
</span><span class="cx"> virtual Scrollbar* verticalScrollbar() const override { return m_vBar.get(); }
</span><span class="cx"> virtual ScrollableArea* enclosingScrollableArea() const override;
</span><span class="lines">@@ -865,8 +870,6 @@
</span><span class="cx"> virtual int scrollSize(ScrollbarOrientation) const override;
</span><span class="cx"> virtual void setScrollOffset(const ScrollOffset&) override;
</span><span class="cx">
</span><del>- virtual ScrollPosition scrollPosition() const override { return m_scrollPosition; }
-
</del><span class="cx"> virtual IntRect visibleContentRectInternal(VisibleContentRectIncludesScrollbars, VisibleContentRectBehavior) const override;
</span><span class="cx"> virtual IntSize visibleSize() const override;
</span><span class="cx"> virtual IntSize contentsSize() const override;
</span></span></pre>
</div>
</div>
</body>
</html>