<!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>[200492] 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/200492">200492</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-05-05 16:25:39 -0700 (Thu, 05 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop traversing at the container block when computing RTL inline static distance.
https://bugs.webkit.org/show_bug.cgi?id=157349
<rdar://problem/25994087>
Reviewed by David Hyatt.
When computing the inline static distance for a child renderer, we start at its enclosing box
and traverse up all the way to the container block.
However when the enclosing box is the ancestor of the container block, we
should just bail out right away since there's no container to use to adjust the position.
Source/WebCore:
Test: fast/multicol/positioned-rtl-column-crash.html
* rendering/RenderBox.cpp:
(WebCore::computeInlineStaticDistance):
LayoutTests:
* fast/multicol/positioned-rtl-column-crash-expected.txt: Added.
* fast/multicol/positioned-rtl-column-crash.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="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolpositionedrtlcolumncrashexpectedtxt">trunk/LayoutTests/fast/multicol/positioned-rtl-column-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmulticolpositionedrtlcolumncrashhtml">trunk/LayoutTests/fast/multicol/positioned-rtl-column-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200491 => 200492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-05 23:22:47 UTC (rev 200491)
+++ trunk/LayoutTests/ChangeLog 2016-05-05 23:25:39 UTC (rev 200492)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-05-05 Zalan Bujtas <zalan@apple.com>
+
+ Stop traversing at the container block when computing RTL inline static distance.
+ https://bugs.webkit.org/show_bug.cgi?id=157349
+ <rdar://problem/25994087>
+
+ Reviewed by David Hyatt.
+
+ When computing the inline static distance for a child renderer, we start at its enclosing box
+ and traverse up all the way to the container block.
+ However when the enclosing box is the ancestor of the container block, we
+ should just bail out right away since there's no container to use to adjust the position.
+
+ * fast/multicol/positioned-rtl-column-crash-expected.txt: Added.
+ * fast/multicol/positioned-rtl-column-crash.html: Added.
+
</ins><span class="cx"> 2016-05-05 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unskip 9 compositing tests on ios-simulator, mark 2 as failures on ios-simulator-wk1
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolpositionedrtlcolumncrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/positioned-rtl-column-crash-expected.txt (0 => 200492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/positioned-rtl-column-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/multicol/positioned-rtl-column-crash-expected.txt 2016-05-05 23:25:39 UTC (rev 200492)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if no crash or ASSERT.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolpositionedrtlcolumncrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/positioned-rtl-column-crash.html (0 => 200492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/positioned-rtl-column-crash.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/positioned-rtl-column-crash.html 2016-05-05 23:25:39 UTC (rev 200492)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that multi-column positioned RTL content works.</title>
+<style>
+div {
+ -webkit-column-count: 2;
+}
+.outer {
+ position: relative;
+ direction: rtl;
+}
+.inner {
+ position: absolute;
+}
+</style>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+<div><span class=outer><span class=inner></span></span></div>
+PASS if no crash or ASSERT.
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200491 => 200492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-05 23:22:47 UTC (rev 200491)
+++ trunk/Source/WebCore/ChangeLog 2016-05-05 23:25:39 UTC (rev 200492)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-05-05 Zalan Bujtas <zalan@apple.com>
+
+ Stop traversing at the container block when computing RTL inline static distance.
+ https://bugs.webkit.org/show_bug.cgi?id=157349
+ <rdar://problem/25994087>
+
+ Reviewed by David Hyatt.
+
+ When computing the inline static distance for a child renderer, we start at its enclosing box
+ and traverse up all the way to the container block.
+ However when the enclosing box is the ancestor of the container block, we
+ should just bail out right away since there's no container to use to adjust the position.
+
+ Test: fast/multicol/positioned-rtl-column-crash.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::computeInlineStaticDistance):
+
</ins><span class="cx"> 2016-05-05 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Add WebKitAdditions extension points in media controls related code in RenderThemeMac
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (200491 => 200492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-05-05 23:22:47 UTC (rev 200491)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-05-05 23:25:39 UTC (rev 200492)
</span><span class="lines">@@ -3383,29 +3383,34 @@
</span><span class="cx"> }
</span><span class="cx"> logicalLeft.setValue(Fixed, staticPosition);
</span><span class="cx"> } else {
</span><del>- const RenderBox& enclosingBox = child->parent()->enclosingBox();
</del><span class="cx"> LayoutUnit staticPosition = child->layer()->staticInlinePosition() + containerLogicalWidth + containerBlock.borderLogicalLeft();
</span><ins>+ auto& enclosingBox = child->parent()->enclosingBox();
+ if (&enclosingBox != &containerBlock && containerBlock.isDescendantOf(&enclosingBox)) {
+ logicalRight.setValue(Fixed, staticPosition);
+ return;
+ }
+
+ staticPosition -= enclosingBox.logicalWidth();
</ins><span class="cx"> for (const RenderElement* current = &enclosingBox; current; current = current->container()) {
</span><del>- if (is<RenderBox>(*current)) {
- if (current != &containerBlock) {
- const auto& renderBox = downcast<RenderBox>(*current);
- staticPosition -= renderBox.logicalLeft();
- if (renderBox.isInFlowPositioned())
- staticPosition -= renderBox.isHorizontalWritingMode() ? renderBox.offsetForInFlowPosition().width() : renderBox.offsetForInFlowPosition().height();
</del><ins>+ if (!is<RenderBox>(*current))
+ continue;
+
+ if (current != &containerBlock) {
+ auto& renderBox = downcast<RenderBox>(*current);
+ staticPosition -= renderBox.logicalLeft();
+ if (renderBox.isInFlowPositioned())
+ staticPosition -= renderBox.isHorizontalWritingMode() ? renderBox.offsetForInFlowPosition().width() : renderBox.offsetForInFlowPosition().height();
+ }
+ if (region && is<RenderBlock>(*current)) {
+ auto& currentBlock = downcast<RenderBlock>(*current);
+ region = currentBlock.clampToStartAndEndRegions(region);
+ RenderBoxRegionInfo* boxInfo = currentBlock.renderBoxRegionInfo(region);
+ if (boxInfo) {
+ if (current != &containerBlock)
+ staticPosition -= currentBlock.logicalWidth() - (boxInfo->logicalLeft() + boxInfo->logicalWidth());
+ if (current == &enclosingBox)
+ staticPosition += enclosingBox.logicalWidth() - boxInfo->logicalWidth();
</ins><span class="cx"> }
</span><del>- if (current == &enclosingBox)
- staticPosition -= enclosingBox.logicalWidth();
- if (region && is<RenderBlock>(*current)) {
- const RenderBlock& currentBlock = downcast<RenderBlock>(*current);
- region = currentBlock.clampToStartAndEndRegions(region);
- RenderBoxRegionInfo* boxInfo = currentBlock.renderBoxRegionInfo(region);
- if (boxInfo) {
- if (current != &containerBlock)
- staticPosition -= currentBlock.logicalWidth() - (boxInfo->logicalLeft() + boxInfo->logicalWidth());
- if (current == &enclosingBox)
- staticPosition += enclosingBox.logicalWidth() - boxInfo->logicalWidth();
- }
- }
</del><span class="cx"> }
</span><span class="cx"> if (current == &containerBlock)
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>