<!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>[168283] releases/WebKitGTK/webkit-2.4/Source/WebCore</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/168283">168283</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-05 06:01:01 -0700 (Mon, 05 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/167278">r167278</a> - Assertion failure !node || node->isElementNode() in
WebCore::RenderBlock::inlineElementContinuation
https://bugs.webkit.org/show_bug.cgi?id=108829
<rdar://problem/13666405>
I can't reproduce this assertion failure, but there seems to be an
invalid assumption in RenderBlock::inlineElementContinuation() that
anything with the "isInline()" bit set is a RenderInline.
No new test because the test case in the bug does not repro for me.
Reviewed by Brent Fulgham.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::inlineElementContinuation):
Dave Hyatt says that this function should only return RenderInline
objects (not non-RenderInline inline objects), so update the checks
from isInline() to isRenderInline() before casting with
toRenderInline().
* rendering/RenderInline.cpp:
(WebCore::RenderInline::inlineElementContinuation):
Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCorerenderingRenderBlockcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCorerenderingRenderInlinecpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderInline.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (168282 => 168283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-05-05 12:55:52 UTC (rev 168282)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-05-05 13:01:01 UTC (rev 168283)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-04-14 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Assertion failure !node || node->isElementNode() in
+ WebCore::RenderBlock::inlineElementContinuation
+
+ https://bugs.webkit.org/show_bug.cgi?id=108829
+ <rdar://problem/13666405>
+
+ I can't reproduce this assertion failure, but there seems to be an
+ invalid assumption in RenderBlock::inlineElementContinuation() that
+ anything with the "isInline()" bit set is a RenderInline.
+
+ No new test because the test case in the bug does not repro for me.
+
+ Reviewed by Brent Fulgham.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::inlineElementContinuation):
+ Dave Hyatt says that this function should only return RenderInline
+ objects (not non-RenderInline inline objects), so update the checks
+ from isInline() to isRenderInline() before casting with
+ toRenderInline().
+
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::inlineElementContinuation):
+ Ditto.
+
</ins><span class="cx"> 2014-04-11 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> Assertion failure changing select element size during focus event
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderBlock.cpp (168282 => 168283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderBlock.cpp 2014-05-05 12:55:52 UTC (rev 168282)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderBlock.cpp 2014-05-05 13:01:01 UTC (rev 168283)
</span><span class="lines">@@ -2565,7 +2565,7 @@
</span><span class="cx"> RenderInline* RenderBlock::inlineElementContinuation() const
</span><span class="cx"> {
</span><span class="cx"> RenderBoxModelObject* continuation = this->continuation();
</span><del>- return continuation && continuation->isInline() ? toRenderInline(continuation) : 0;
</del><ins>+ return continuation && continuation->isRenderInline() ? toRenderInline(continuation) : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderBlock* RenderBlock::blockElementContinuation() const
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderInline.cpp (168282 => 168283)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderInline.cpp 2014-05-05 12:55:52 UTC (rev 168282)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/rendering/RenderInline.cpp 2014-05-05 13:01:01 UTC (rev 168283)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> RenderInline* RenderInline::inlineElementContinuation() const
</span><span class="cx"> {
</span><span class="cx"> RenderBoxModelObject* continuation = this->continuation();
</span><del>- if (!continuation || continuation->isInline())
</del><ins>+ if (!continuation || continuation->isRenderInline())
</ins><span class="cx"> return toRenderInline(continuation);
</span><span class="cx"> return toRenderBlock(continuation)->inlineElementContinuation();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>