<!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>[200261] 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/200261">200261</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-04-29 13:33:48 -0700 (Fri, 29 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[RTL Scrollbars] REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/200116">r200116</a>): Positioned contents can overlap RTL scrollbars
https://bugs.webkit.org/show_bug.cgi?id=157164
<rdar://problem/25993610>
Reviewed by Darin Adler.
Source/WebCore:
There was some code left over from the old implementation of RTL_SCROLLBARS
which had some faulty assumptions about the interaction between direction
and scrollbar placement. In particular, once we began obeying the "dir"
attribute in <a href="http://trac.webkit.org/projects/webkit/changeset/200116">r200116</a>, these assumptions were no longer valid.
Test: fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars.html
scrollbars/rtl/div-absolute.html
scrollbars/rtl/div-horizontal.html
* rendering/InlineFlowBox.h:
(WebCore::InlineFlowBox::layoutOverflowRect):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computeOverflow): Deleted.
* rendering/RenderBox.cpp:
(WebCore::RenderBox::layoutOverflowRectForPropagation):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::computeScrollDimensions):
LayoutTests:
* TestExpectations:
* fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars-expected.html: Added.
* fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineFlowBoxh">trunk/Source/WebCore/rendering/InlineFlowBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastscrollingrtlscrollbarspositionedintersectscrollbarsexpectedhtml">trunk/LayoutTests/fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastscrollingrtlscrollbarspositionedintersectscrollbarshtml">trunk/LayoutTests/fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200260 => 200261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-29 20:29:18 UTC (rev 200260)
+++ trunk/LayoutTests/ChangeLog 2016-04-29 20:33:48 UTC (rev 200261)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-04-29 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [RTL Scrollbars] REGRESSION(r200116): Positioned contents can overlap RTL scrollbars
+ https://bugs.webkit.org/show_bug.cgi?id=157164
+ <rdar://problem/25993610>
+
+ Reviewed by Darin Adler.
+
+ * TestExpectations:
+ * fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars-expected.html: Added.
+ * fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars.html: Added.
+
</ins><span class="cx"> 2016-04-29 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] r65681 broke a couple GTK+ a11y tests
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (200260 => 200261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-04-29 20:29:18 UTC (rev 200260)
+++ trunk/LayoutTests/TestExpectations 2016-04-29 20:33:48 UTC (rev 200261)
</span><span class="lines">@@ -989,6 +989,7 @@
</span><span class="cx"> fast/scrolling/rtl-scrollbars-listbox-select-right.html [ ImageOnlyFailure ]
</span><span class="cx"> fast/scrolling/rtl-scrollbars-listbox-simple.html [ ImageOnlyFailure ]
</span><span class="cx"> fast/scrolling/rtl-scrollbars-listbox.html [ ImageOnlyFailure ]
</span><ins>+fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars.html [ ImageOnlyFailure ]
</ins><span class="cx">
</span><span class="cx"> # <a download> does not support Blobs
</span><span class="cx"> webkit.org/b/156099 http/tests/security/anchor-download-allow-blob.html [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingrtlscrollbarspositionedintersectscrollbarsexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars-expected.html (0 => 200261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars-expected.html (rev 0)
+++ trunk/LayoutTests/fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars-expected.html 2016-04-29 20:33:48 UTC (rev 200261)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+</style>
+</head>
+<body>
+This test makes sure that positioned elements do not intersect with RTL scrollbars. The test passes if you see the word "Test" below (and its not clipped at all).
+<div style="position: relative; overflow: hidden; width: 85px; height: 85px;">
+<div style="position: absolute; bottom: 0px; left: 0px; font-family: Ahem">Test</div>
+</div>
+<script>
+var scrollme = document.getElementById("scrollme");
+scrollme.scrollTop = 400;
+scrollme.scrollLeft = -400;
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingrtlscrollbarspositionedintersectscrollbarshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars.html (0 => 200261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars.html (rev 0)
+++ trunk/LayoutTests/fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars.html 2016-04-29 20:33:48 UTC (rev 200261)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+</style>
+</head>
+<body>
+This test makes sure that positioned elements do not intersect with RTL scrollbars. The test passes if you see the word "Test" below (and its not clipped at all).
+<div style="overflow: hidden; width: 85px; height: 85px;">
+<div id="scrollme" dir="rtl" style="position: relative; overflow: auto; width: 100px; height: 100px; left: -15px;">
+<div style="position: absolute; top: 200px; right: 250px; font-family: Ahem">Test</div>
+</div>
+</div>
+<script>
+var scrollme = document.getElementById("scrollme");
+scrollme.scrollTop = 400;
+scrollme.scrollLeft = -400;
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200260 => 200261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-29 20:29:18 UTC (rev 200260)
+++ trunk/Source/WebCore/ChangeLog 2016-04-29 20:33:48 UTC (rev 200261)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-04-29 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [RTL Scrollbars] REGRESSION(r200116): Positioned contents can overlap RTL scrollbars
+ https://bugs.webkit.org/show_bug.cgi?id=157164
+ <rdar://problem/25993610>
+
+ Reviewed by Darin Adler.
+
+ There was some code left over from the old implementation of RTL_SCROLLBARS
+ which had some faulty assumptions about the interaction between direction
+ and scrollbar placement. In particular, once we began obeying the "dir"
+ attribute in r200116, these assumptions were no longer valid.
+
+ Test: fast/scrolling/rtl-scrollbars-positioned-intersect-scrollbars.html
+ scrollbars/rtl/div-absolute.html
+ scrollbars/rtl/div-horizontal.html
+
+ * rendering/InlineFlowBox.h:
+ (WebCore::InlineFlowBox::layoutOverflowRect):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::computeOverflow): Deleted.
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::layoutOverflowRectForPropagation):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::computeScrollDimensions):
+
</ins><span class="cx"> 2016-04-29 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: CharacterOffset not working correctly with composed characters and collapsed white spaces
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineFlowBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineFlowBox.h (200260 => 200261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineFlowBox.h 2016-04-29 20:29:18 UTC (rev 200260)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.h 2016-04-29 20:33:48 UTC (rev 200261)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> // For horizontal-tb and vertical-lr they will match physical directions, but for horizontal-bt and vertical-rl, the top/bottom and left/right
</span><span class="cx"> // respectively are flipped when compared to their physical counterparts. For example minX is on the left in vertical-lr, but it is on the right in vertical-rl.
</span><span class="cx"> LayoutRect layoutOverflowRect(LayoutUnit lineTop, LayoutUnit lineBottom) const
</span><del>- {
</del><ins>+ {
</ins><span class="cx"> return m_overflow ? m_overflow->layoutOverflowRect() : enclosingLayoutRect(frameRectIncludingLineHeight(lineTop, lineBottom));
</span><span class="cx"> }
</span><span class="cx"> LayoutUnit logicalTopLayoutOverflow(LayoutUnit lineTop) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (200260 => 200261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-04-29 20:29:18 UTC (rev 200260)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-04-29 20:33:48 UTC (rev 200261)
</span><span class="lines">@@ -1000,13 +1000,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// Overflow is always relative to the border-box of the element in question.
+// Therefore, if the element has a vertical scrollbar placed on the left, an overflow rect at x=2px would conceptually intersect the scrollbar.
</ins><span class="cx"> void RenderBlock::computeOverflow(LayoutUnit oldClientAfterEdge, bool)
</span><span class="cx"> {
</span><span class="cx"> clearOverflow();
</span><del>- // Add overflow from children.
</del><span class="cx"> addOverflowFromChildren();
</span><span class="cx">
</span><del>- // Add in the overflow from positioned objects.
</del><span class="cx"> addOverflowFromPositionedObjects();
</span><span class="cx">
</span><span class="cx"> if (hasOverflowClip()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (200260 => 200261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-04-29 20:29:18 UTC (rev 200260)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-04-29 20:33:48 UTC (rev 200261)
</span><span class="lines">@@ -4903,7 +4903,7 @@
</span><span class="cx"> flipForWritingMode(rect);
</span><span class="cx"> // Subtract space occupied by scrollbars. They are at their physical edge in this coordinate
</span><span class="cx"> // system, so order is important here: first flip, then subtract scrollbars.
</span><del>- if (shouldPlaceBlockDirectionScrollbarOnLeft() && style().isLeftToRightDirection())
</del><ins>+ if (shouldPlaceBlockDirectionScrollbarOnLeft())
</ins><span class="cx"> rect.move(verticalScrollbarWidth(), 0);
</span><span class="cx"> rect.contract(verticalScrollbarWidth(), horizontalScrollbarHeight());
</span><span class="cx"> return rect;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (200260 => 200261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-04-29 20:29:18 UTC (rev 200260)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-04-29 20:33:48 UTC (rev 200261)
</span><span class="lines">@@ -3380,8 +3380,8 @@
</span><span class="cx"> m_scrollSize.setHeight(overflowBottom() - overflowTop());
</span><span class="cx">
</span><span class="cx"> int scrollableLeftOverflow = overflowLeft() - box->borderLeft();
</span><del>- if (box->style().isLeftToRightDirection() && box->shouldPlaceBlockDirectionScrollbarOnLeft() && m_vBar)
- scrollableLeftOverflow -= m_vBar->occupiedWidth();
</del><ins>+ if (shouldPlaceBlockDirectionScrollbarOnLeft())
+ scrollableLeftOverflow -= verticalScrollbarWidth();
</ins><span class="cx"> int scrollableTopOverflow = overflowTop() - box->borderTop();
</span><span class="cx"> setScrollOrigin(IntPoint(-scrollableLeftOverflow, -scrollableTopOverflow));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>