<!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>[195208] releases/WebKitGTK/webkit-2.10</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/195208">195208</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-18 04:52:33 -0800 (Mon, 18 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194638">r194638</a> - isAnonymousInlineBlock() should exclude any ruby content.
https://bugs.webkit.org/show_bug.cgi?id=152648
<rdar://problem/23872549>
Reviewed by David Hyatt.
isAnonymousInlineBlock is designed for the new Block-Inside-Inline Model
and all other anonymous inline-block renderers (including Ruby) should bail out of it.
(see webkit.org/b/143145)
Source/WebCore:
Test: fast/ruby/ruby-inline-margin-collapse-crash.html
* rendering/RenderObject.cpp:
(WebCore::RenderObject::isAnonymousInlineBlock):
* rendering/RenderObject.h:
(WebCore::RenderObject::isAnonymousInlineBlock): Deleted.
LayoutTests:
* fast/ruby/ruby-inline-margin-collapse-crash-expected.txt: Added.
* fast/ruby/ruby-inline-margin-collapse-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderObjectcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderObjecth">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastrubyrubyinlinemargincollapsecrashexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/ruby/ruby-inline-margin-collapse-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastrubyrubyinlinemargincollapsecrashhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/ruby/ruby-inline-margin-collapse-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195207 => 195208)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-18 12:18:35 UTC (rev 195207)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-18 12:52:33 UTC (rev 195208)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-01-06 Zalan Bujtas <zalan@apple.com>
+
+ isAnonymousInlineBlock() should exclude any ruby content.
+ https://bugs.webkit.org/show_bug.cgi?id=152648
+ <rdar://problem/23872549>
+
+ Reviewed by David Hyatt.
+
+ isAnonymousInlineBlock is designed for the new Block-Inside-Inline Model
+ and all other anonymous inline-block renderers (including Ruby) should bail out of it.
+ (see webkit.org/b/143145)
+
+ * fast/ruby/ruby-inline-margin-collapse-crash-expected.txt: Added.
+ * fast/ruby/ruby-inline-margin-collapse-crash.html: Added.
+
</ins><span class="cx"> 2016-01-05 Pranjal Jumde <pjumde@apple.com>
</span><span class="cx">
</span><span class="cx"> Image should not be re-registered if m_form already exists. This leads to an assertion failure.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastrubyrubyinlinemargincollapsecrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/ruby/ruby-inline-margin-collapse-crash-expected.txt (0 => 195208)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/ruby/ruby-inline-margin-collapse-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/ruby/ruby-inline-margin-collapse-crash-expected.txt 2016-01-18 12:52:33 UTC (rev 195208)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Pass if no crash or assert in debug.
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastrubyrubyinlinemargincollapsecrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/ruby/ruby-inline-margin-collapse-crash.html (0 => 195208)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/ruby/ruby-inline-margin-collapse-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/ruby/ruby-inline-margin-collapse-crash.html 2016-01-18 12:52:33 UTC (rev 195208)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<style>
+ ruby:after {
+ display: block;
+ content: "bar";
+ }
+</style>
+Pass if no crash or assert in debug.<ruby>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195207 => 195208)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-18 12:18:35 UTC (rev 195207)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-18 12:52:33 UTC (rev 195208)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-01-06 Zalan Bujtas <zalan@apple.com>
+
+ isAnonymousInlineBlock() should exclude any ruby content.
+ https://bugs.webkit.org/show_bug.cgi?id=152648
+ <rdar://problem/23872549>
+
+ Reviewed by David Hyatt.
+
+ isAnonymousInlineBlock is designed for the new Block-Inside-Inline Model
+ and all other anonymous inline-block renderers (including Ruby) should bail out of it.
+ (see webkit.org/b/143145)
+
+ Test: fast/ruby/ruby-inline-margin-collapse-crash.html
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::isAnonymousInlineBlock):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::isAnonymousInlineBlock): Deleted.
+
</ins><span class="cx"> 2016-01-05 Pranjal Jumde <pjumde@apple.com>
</span><span class="cx">
</span><span class="cx"> Image should not be re-registered if m_form already exists. This leads to an assertion failure.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.cpp (195207 => 195208)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.cpp 2016-01-18 12:18:35 UTC (rev 195207)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.cpp 2016-01-18 12:52:33 UTC (rev 195208)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> #include "RenderMultiColumnFlowThread.h"
</span><span class="cx"> #include "RenderNamedFlowFragment.h"
</span><span class="cx"> #include "RenderNamedFlowThread.h"
</span><ins>+#include "RenderRuby.h"
</ins><span class="cx"> #include "RenderSVGResourceContainer.h"
</span><span class="cx"> #include "RenderScrollbarPart.h"
</span><span class="cx"> #include "RenderTheme.h"
</span><span class="lines">@@ -1700,6 +1701,11 @@
</span><span class="cx"> return hasLayer() && downcast<RenderLayerModelObject>(*this).layer()->isComposited();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool RenderObject::isAnonymousInlineBlock() const
+{
+ return isAnonymous() && style().display() == INLINE_BLOCK && style().styleType() == NOPSEUDO && isRenderBlockFlow() && !isRubyRun() && !isRubyBase() && !isRuby(parent());
+}
+
</ins><span class="cx"> bool RenderObject::hitTest(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestFilter hitTestFilter)
</span><span class="cx"> {
</span><span class="cx"> bool inside = false;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.h (195207 => 195208)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.h 2016-01-18 12:18:35 UTC (rev 195207)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderObject.h 2016-01-18 12:52:33 UTC (rev 195208)
</span><span class="lines">@@ -490,11 +490,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> ;
</span><span class="cx"> }
</span><del>- bool isAnonymousInlineBlock() const
- {
- return isAnonymous() && style().display() == INLINE_BLOCK && style().styleType() == NOPSEUDO && isRenderBlockFlow() && !isRubyRun() && !isRubyBase();
- }
-
</del><ins>+ bool isAnonymousInlineBlock() const;
</ins><span class="cx"> bool isElementContinuation() const { return node() && node()->renderer() != this; }
</span><span class="cx"> bool isInlineElementContinuation() const { return isElementContinuation() && isInline(); }
</span><span class="cx"> bool isBlockElementContinuation() const { return isElementContinuation() && !isInline(); }
</span></span></pre>
</div>
</div>
</body>
</html>