<!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>[207275] 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/207275">207275</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-10-12 20:48:54 -0700 (Wed, 12 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderRubyRun should not mark child renderers dirty at the end of layout.
https://bugs.webkit.org/show_bug.cgi?id=163359
<rdar://problem/28711840>
Reviewed by David Hyatt.
Source/WebCore:
The current layout logic does not support marking renderers dirty for subsequent layouts.
Layout needs to exit with a clean tree.
Should relayoutChild be insufficient, we could also mark the base/text dirty for the justified content.
Test: fast/ruby/rubyrun-has-bad-child.html
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::updateRubyForJustifiedText):
* rendering/RenderRubyRun.cpp:
(WebCore::RenderRubyRun::layout):
(WebCore::RenderRubyRun::layoutBlock):
* rendering/RenderRubyRun.h:
LayoutTests:
* fast/ruby/rubyrun-has-bad-child-expected.txt: Added.
* fast/ruby/rubyrun-has-bad-child.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="#trunkSourceWebCorerenderingRenderBlockLineLayoutcpp">trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRubyRuncpp">trunk/Source/WebCore/rendering/RenderRubyRun.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRubyRunh">trunk/Source/WebCore/rendering/RenderRubyRun.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastrubyrubyrunhasbadchildexpectedtxt">trunk/LayoutTests/fast/ruby/rubyrun-has-bad-child-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastrubyrubyrunhasbadchildhtml">trunk/LayoutTests/fast/ruby/rubyrun-has-bad-child.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207274 => 207275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-13 03:16:15 UTC (rev 207274)
+++ trunk/LayoutTests/ChangeLog 2016-10-13 03:48:54 UTC (rev 207275)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-10-12 Zalan Bujtas <zalan@apple.com>
+
+ RenderRubyRun should not mark child renderers dirty at the end of layout.
+ https://bugs.webkit.org/show_bug.cgi?id=163359
+ <rdar://problem/28711840>
+
+ Reviewed by David Hyatt.
+
+ * fast/ruby/rubyrun-has-bad-child-expected.txt: Added.
+ * fast/ruby/rubyrun-has-bad-child.html: Added.
+
</ins><span class="cx"> 2016-10-12 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> polygonPathFromPoints calls uncheckedAppend, but assertion size() < capacity() fails
</span></span></pre></div>
<a id="trunkLayoutTestsfastrubyrubyrunhasbadchildexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/ruby/rubyrun-has-bad-child-expected.txt (0 => 207275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/rubyrun-has-bad-child-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/ruby/rubyrun-has-bad-child-expected.txt 2016-10-13 03:48:54 UTC (rev 207275)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no crash or assert in debug. r foobarfoobar
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastrubyrubyrunhasbadchildhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/ruby/rubyrun-has-bad-child.html (0 => 207275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/rubyrun-has-bad-child.html (rev 0)
+++ trunk/LayoutTests/fast/ruby/rubyrun-has-bad-child.html 2016-10-13 03:48:54 UTC (rev 207275)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we can rendere ruby with text-align justified properly.</title>
+<style>
+body {
+ text-align: justify;
+ font: 150px Litherum;
+}
+</style>
+</head>
+<body>
+PASS if no crash or assert in debug.
+<ruby><rb>r</rb>
+ <canvas id=canvasId></canvas></ruby>
+foobarfoobar<ruby><rt id=rtId></rt></ruby><div id=divId></div>
+</body>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+var rt = document.getElementById("rtId");
+var canvas = document.getElementById("canvasId");
+rt.parentNode.removeChild(rt);
+canvas.parentNode.insertBefore(rt, canvas);
+</script>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207274 => 207275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-13 03:16:15 UTC (rev 207274)
+++ trunk/Source/WebCore/ChangeLog 2016-10-13 03:48:54 UTC (rev 207275)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-10-12 Zalan Bujtas <zalan@apple.com>
+
+ RenderRubyRun should not mark child renderers dirty at the end of layout.
+ https://bugs.webkit.org/show_bug.cgi?id=163359
+ <rdar://problem/28711840>
+
+ Reviewed by David Hyatt.
+
+ The current layout logic does not support marking renderers dirty for subsequent layouts.
+ Layout needs to exit with a clean tree.
+ Should relayoutChild be insufficient, we could also mark the base/text dirty for the justified content.
+
+ Test: fast/ruby/rubyrun-has-bad-child.html
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::updateRubyForJustifiedText):
+ * rendering/RenderRubyRun.cpp:
+ (WebCore::RenderRubyRun::layout):
+ (WebCore::RenderRubyRun::layoutBlock):
+ * rendering/RenderRubyRun.h:
+
</ins><span class="cx"> 2016-10-12 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when using megaplan.ru
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (207274 => 207275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2016-10-13 03:16:15 UTC (rev 207274)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2016-10-13 03:48:54 UTC (rev 207275)
</span><span class="lines">@@ -580,12 +580,6 @@
</span><span class="cx"> rubyRun.clearOverrideLogicalContentWidth();
</span><span class="cx"> r.box()->setExpansion(newRubyRunWidth - r.box()->logicalWidth());
</span><span class="cx">
</span><del>- // This relayout caused the size of the RenderRubyText and the RenderRubyBase to change, dependent on the line's current expansion. Next time we relayout the
- // RenderRubyRun, make sure that we relayout the RenderRubyBase and RenderRubyText as well.
- rubyBase.setNeedsLayout(MarkOnlyThis);
- if (RenderRubyText* rubyText = rubyRun.rubyText())
- rubyText->setNeedsLayout(MarkOnlyThis);
-
</del><span class="cx"> totalLogicalWidth += totalExpansion;
</span><span class="cx"> expansionOpportunityCount -= totalOpportunitiesInRun;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRubyRuncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRubyRun.cpp (207274 => 207275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRubyRun.cpp 2016-10-13 03:16:15 UTC (rev 207274)
+++ trunk/Source/WebCore/rendering/RenderRubyRun.cpp 2016-10-13 03:48:54 UTC (rev 207275)
</span><span class="lines">@@ -230,15 +230,26 @@
</span><span class="cx"> {
</span><span class="cx"> if (RenderRubyBase* base = rubyBase())
</span><span class="cx"> base->reset();
</span><ins>+ RenderBlockFlow::layout();
+}
</ins><span class="cx">
</span><del>- RenderBlockFlow::layout();
-
</del><ins>+void RenderRubyRun::layoutBlock(bool relayoutChildren, LayoutUnit pageHeight)
+{
+ if (!relayoutChildren) {
+ // Since the extra relayout in RenderBlockFlow::updateRubyForJustifiedText() causes the size of the RenderRubyText/RenderRubyBase
+ // dependent on the line's current expansion, whenever we relayout the RenderRubyRun, we need to relayout the RenderRubyBase/RenderRubyText as well.
+ // FIXME: We should take the expansion opportunities into account if possible.
+ relayoutChildren = style().textAlign() == JUSTIFY;
+ }
+
+ RenderBlockFlow::layoutBlock(relayoutChildren, pageHeight);
+
</ins><span class="cx"> RenderRubyText* rt = rubyText();
</span><span class="cx"> if (!rt)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> rt->setLogicalLeft(0);
</span><del>-
</del><ins>+
</ins><span class="cx"> // Place the RenderRubyText such that its bottom is flush with the lineTop of the first line of the RenderRubyBase.
</span><span class="cx"> LayoutUnit lastLineRubyTextBottom = rt->logicalHeight();
</span><span class="cx"> LayoutUnit firstLineRubyTextTop = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRubyRunh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRubyRun.h (207274 => 207275)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRubyRun.h 2016-10-13 03:16:15 UTC (rev 207274)
+++ trunk/Source/WebCore/rendering/RenderRubyRun.h 2016-10-13 03:48:54 UTC (rev 207275)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx">
</span><span class="cx"> RenderObject* layoutSpecialExcludedChild(bool relayoutChildren) override;
</span><span class="cx"> void layout() override;
</span><ins>+ void layoutBlock(bool relayoutChildren, LayoutUnit pageHeight = 0) override;
</ins><span class="cx">
</span><span class="cx"> bool isChildAllowed(const RenderObject&, const RenderStyle&) const override;
</span><span class="cx"> void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
</span></span></pre>
</div>
</div>
</body>
</html>