<!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>[176181] releases/WebKitGTK/webkit-2.6</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/176181">176181</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-16 23:48:28 -0800 (Sun, 16 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/175807">r175807</a> - ASSERTION FAILED: !object || !object->parent()->isRuby() || is<RenderRubyRun>(*object) || (object->isInline() && (object->isBeforeContent() || object->isAfterContent())) || (object->isAnonymous() && ... ) in WebCore::isAnonymousRubyInlineBlock
https://bugs.webkit.org/show_bug.cgi?id=137958
Reviewed by Chris Dumez.
Source/WebCore:
When a ruby element, with block behavior, dynamically changes its style
from multicol to without multicol, we have to remove its special children,
RenderMultiColumnFlowThread and RenderMultiColumnSet, the normal way using
the method in RenderBlockFlow base class. This patch adds both
RenderMultiColumnFlowThread and RenderMultiColumnSet to the list of RenderRuby
children removed normally and adds a new function - isRubyChildForNormalRemove -
to test the condition and use it in the assertion in RenderRuby*::removeChild
method.
Test: fast/multicol/newmulticol/ruby-from-multicol-to-auto.html
* rendering/RenderRuby.cpp:
(WebCore::isRubyChildForNormalRemove):
(WebCore::RenderRubyAsInline::removeChild):
(WebCore::RenderRubyAsBlock::removeChild):
LayoutTests:
* fast/multicol/newmulticol/ruby-from-multicol-to-auto-expected.txt: Added.
* fast/multicol/newmulticol/ruby-from-multicol-to-auto.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingRenderRubycpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderRuby.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastmulticolnewmulticolrubyfrommulticoltoautoexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/newmulticol/ruby-from-multicol-to-auto-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastmulticolnewmulticolrubyfrommulticoltoautohtml">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/newmulticol/ruby-from-multicol-to-auto.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (176180 => 176181)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-11-17 07:44:20 UTC (rev 176180)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-11-17 07:48:28 UTC (rev 176181)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-11-10 Mihnea Ovidenie <mihnea@adobe.com>
+
+ ASSERTION FAILED: !object || !object->parent()->isRuby() || is<RenderRubyRun>(*object) || (object->isInline() && (object->isBeforeContent() || object->isAfterContent())) || (object->isAnonymous() && ... ) in WebCore::isAnonymousRubyInlineBlock
+ https://bugs.webkit.org/show_bug.cgi?id=137958
+
+ Reviewed by Chris Dumez.
+
+ * fast/multicol/newmulticol/ruby-from-multicol-to-auto-expected.txt: Added.
+ * fast/multicol/newmulticol/ruby-from-multicol-to-auto.html: Added.
+
</ins><span class="cx"> 2014-11-13 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: [ATK] Do not return ATK_ROLE_UNKNOWN for null or otherwise invalid accessible objects
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastmulticolnewmulticolrubyfrommulticoltoautoexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/newmulticol/ruby-from-multicol-to-auto-expected.txt (0 => 176181)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/newmulticol/ruby-from-multicol-to-auto-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/newmulticol/ruby-from-multicol-to-auto-expected.txt 2014-11-17 07:48:28 UTC (rev 176181)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+Test that a ruby element with multicol style is correctly laid out when it loses the multicol style.
+
+On success you see PASS below.
+
+PASS
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastmulticolnewmulticolrubyfrommulticoltoautohtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/newmulticol/ruby-from-multicol-to-auto.html (0 => 176181)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/newmulticol/ruby-from-multicol-to-auto.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/newmulticol/ruby-from-multicol-to-auto.html 2014-11-17 07:48:28 UTC (rev 176181)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <!-- https://bugs.webkit.org/show_bug.cgi?id=137929 -->
+ <style>
+ #target {
+ position: absolute;
+ top: 100px;
+ left: 20px;
+ }
+ .multicol { -webkit-column-count: 2; }
+ .noMulticol { -webkit-column-count: auto; }
+ </style>
+ </head>
+ <body>
+ <p>Test that a ruby element with multicol style is correctly laid out when it loses the multicol style.</p>
+ <p>On success you see PASS below.</p>
+ <ruby id="target" class="multicol">PASS</ruby>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ document.body.offsetTop;
+ document.getElementById("target").className = "noMulticol";
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (176180 => 176181)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-17 07:44:20 UTC (rev 176180)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-17 07:48:28 UTC (rev 176181)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-11-10 Mihnea Ovidenie <mihnea@adobe.com>
+
+ ASSERTION FAILED: !object || !object->parent()->isRuby() || is<RenderRubyRun>(*object) || (object->isInline() && (object->isBeforeContent() || object->isAfterContent())) || (object->isAnonymous() && ... ) in WebCore::isAnonymousRubyInlineBlock
+ https://bugs.webkit.org/show_bug.cgi?id=137958
+
+ Reviewed by Chris Dumez.
+
+ When a ruby element, with block behavior, dynamically changes its style
+ from multicol to without multicol, we have to remove its special children,
+ RenderMultiColumnFlowThread and RenderMultiColumnSet, the normal way using
+ the method in RenderBlockFlow base class. This patch adds both
+ RenderMultiColumnFlowThread and RenderMultiColumnSet to the list of RenderRuby
+ children removed normally and adds a new function - isRubyChildForNormalRemove -
+ to test the condition and use it in the assertion in RenderRuby*::removeChild
+ method.
+
+ Test: fast/multicol/newmulticol/ruby-from-multicol-to-auto.html
+
+ * rendering/RenderRuby.cpp:
+ (WebCore::isRubyChildForNormalRemove):
+ (WebCore::RenderRubyAsInline::removeChild):
+ (WebCore::RenderRubyAsBlock::removeChild):
+
</ins><span class="cx"> 2014-11-13 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: [ATK] Do not return ATK_ROLE_UNKNOWN for null or otherwise invalid accessible objects
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingRenderRubycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderRuby.cpp (176180 => 176181)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderRuby.cpp 2014-11-17 07:44:20 UTC (rev 176180)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderRuby.cpp 2014-11-17 07:48:28 UTC (rev 176181)
</span><span class="lines">@@ -72,6 +72,18 @@
</span><span class="cx"> && object->firstChildSlow()->style().styleType() == AFTER;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#ifndef ASSERT_DISABLED
+static inline bool isRubyChildForNormalRemoval(const RenderObject& object)
+{
+ return object.isRubyRun()
+ || object.isBeforeContent()
+ || object.isAfterContent()
+ || object.isRenderMultiColumnFlowThread()
+ || object.isRenderMultiColumnSet()
+ || isAnonymousRubyInlineBlock(&object);
+}
+#endif
+
</ins><span class="cx"> static inline RenderBlock* rubyBeforeBlock(const RenderElement* ruby)
</span><span class="cx"> {
</span><span class="cx"> RenderObject* child = ruby->firstChild();
</span><span class="lines">@@ -192,7 +204,9 @@
</span><span class="cx"> // If the child's parent is *this (must be a ruby run or generated content or anonymous block),
</span><span class="cx"> // just use the normal remove method.
</span><span class="cx"> if (child.parent() == this) {
</span><del>- ASSERT(child.isRubyRun() || child.isBeforeContent() || child.isAfterContent() || isAnonymousRubyInlineBlock(&child));
</del><ins>+#ifndef ASSERT_DISABLED
+ ASSERT(isRubyChildForNormalRemoval(child));
+#endif
</ins><span class="cx"> return RenderInline::removeChild(child);
</span><span class="cx"> }
</span><span class="cx"> // If the child's parent is an anoymous block (must be generated :before/:after content)
</span><span class="lines">@@ -296,7 +310,9 @@
</span><span class="cx"> // If the child's parent is *this (must be a ruby run or generated content or anonymous block),
</span><span class="cx"> // just use the normal remove method.
</span><span class="cx"> if (child.parent() == this) {
</span><del>- ASSERT(child.isRubyRun() || child.isBeforeContent() || child.isAfterContent() || isAnonymousRubyInlineBlock(&child));
</del><ins>+#ifndef ASSERT_DISABLED
+ ASSERT(isRubyChildForNormalRemoval(child));
+#endif
</ins><span class="cx"> return RenderBlockFlow::removeChild(child);
</span><span class="cx"> }
</span><span class="cx"> // If the child's parent is an anoymous block (must be generated :before/:after content)
</span></span></pre>
</div>
</div>
</body>
</html>