<!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>[185756] 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/185756">185756</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-06-19 11:18:05 -0700 (Fri, 19 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderRubyText requires RenderRubyRun parent.
https://bugs.webkit.org/show_bug.cgi?id=146148
rdar://problem/21423319
Reviewed by Simon Fraser.
RenderRubyText expects its parent to be RenderRubyRun and since a
a non-block <rt> requires anonymous wrapper, we should check whether
the display type is actually block.
Source/WebCore:
Test: fast/ruby/crash-when-ruby-rt-is-non-block.html
* html/RubyTextElement.cpp:
(WebCore::RubyTextElement::createElementRenderer):
LayoutTests:
* fast/ruby/crash-when-ruby-rt-is-non-block-expected.txt: Added.
* fast/ruby/crash-when-ruby-rt-is-non-block.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="#trunkSourceWebCorehtmlRubyTextElementcpp">trunk/Source/WebCore/html/RubyTextElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastrubycrashwhenrubyrtisnonblockexpectedtxt">trunk/LayoutTests/fast/ruby/crash-when-ruby-rt-is-non-block-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastrubycrashwhenrubyrtisnonblockhtml">trunk/LayoutTests/fast/ruby/crash-when-ruby-rt-is-non-block.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185755 => 185756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-19 17:46:02 UTC (rev 185755)
+++ trunk/LayoutTests/ChangeLog 2015-06-19 18:18:05 UTC (rev 185756)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-19 Zalan Bujtas <zalan@apple.com>
+
+ RenderRubyText requires RenderRubyRun parent.
+ https://bugs.webkit.org/show_bug.cgi?id=146148
+ rdar://problem/21423319
+
+ Reviewed by Simon Fraser.
+
+ RenderRubyText expects its parent to be RenderRubyRun and since a
+ a non-block <rt> requires anonymous wrapper, we should check whether
+ the display type is actually block.
+
+ * fast/ruby/crash-when-ruby-rt-is-non-block-expected.txt: Added.
+ * fast/ruby/crash-when-ruby-rt-is-non-block.html: Added.
+
</ins><span class="cx"> 2015-06-19 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove unnecessary svn:executable flags
</span></span></pre></div>
<a id="trunkLayoutTestsfastrubycrashwhenrubyrtisnonblockexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/ruby/crash-when-ruby-rt-is-non-block-expected.txt (0 => 185756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/crash-when-ruby-rt-is-non-block-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/ruby/crash-when-ruby-rt-is-non-block-expected.txt 2015-06-19 18:18:05 UTC (rev 185756)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no crash or assert in debug.
+foo barfoobar
</ins></span></pre></div>
<a id="trunkLayoutTestsfastrubycrashwhenrubyrtisnonblockhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/ruby/crash-when-ruby-rt-is-non-block.html (0 => 185756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/ruby/crash-when-ruby-rt-is-non-block.html (rev 0)
+++ trunk/LayoutTests/fast/ruby/crash-when-ruby-rt-is-non-block.html 2015-06-19 18:18:05 UTC (rev 185756)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we can handle non-block ruby text.</title>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+ <ruby>PASS if no crash or assert in debug.<br>
+ <rt style="display: inline">foo</rt></ruby>
+ <ruby>bar<rt style="display: inline-block">foobar</rt></ruby>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185755 => 185756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-19 17:46:02 UTC (rev 185755)
+++ trunk/Source/WebCore/ChangeLog 2015-06-19 18:18:05 UTC (rev 185756)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-06-19 Zalan Bujtas <zalan@apple.com>
+
+ RenderRubyText requires RenderRubyRun parent.
+ https://bugs.webkit.org/show_bug.cgi?id=146148
+ rdar://problem/21423319
+
+ Reviewed by Simon Fraser.
+
+ RenderRubyText expects its parent to be RenderRubyRun and since a
+ a non-block <rt> requires anonymous wrapper, we should check whether
+ the display type is actually block.
+
+ Test: fast/ruby/crash-when-ruby-rt-is-non-block.html
+
+ * html/RubyTextElement.cpp:
+ (WebCore::RubyTextElement::createElementRenderer):
+
</ins><span class="cx"> 2015-06-19 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> cancelPreviousPerformRequestsWithTarget for -resolveBounds in wrong class.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRubyTextElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RubyTextElement.cpp (185755 => 185756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RubyTextElement.cpp 2015-06-19 17:46:02 UTC (rev 185755)
+++ trunk/Source/WebCore/html/RubyTextElement.cpp 2015-06-19 18:18:05 UTC (rev 185756)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> RenderPtr<RenderElement> RubyTextElement::createElementRenderer(Ref<RenderStyle>&& style, const RenderTreePosition& insertionPosition)
</span><span class="cx"> {
</span><span class="cx"> // RenderRubyText requires its parent to be RenderRubyRun.
</span><del>- if (isRuby(insertionPosition.parent()))
</del><ins>+ if (isRuby(insertionPosition.parent()) && style.get().display() == BLOCK)
</ins><span class="cx"> return createRenderer<RenderRubyText>(*this, WTF::move(style));
</span><span class="cx"> return HTMLElement::createElementRenderer(WTF::move(style), insertionPosition);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>