<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[31227] trunk</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/31227">31227</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2008-03-21 23:57:28 -0700 (Fri, 21 Mar 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebCore:
Reviewed by Oliver Hunt.
- fix http://bugs.webkit.org/show_bug.cgi?id=17988
REGRESSION (r31114-31132): Crash in InlineBox::isDirty() opening chowhound.com
Test: fast/css-generated-content/empty-content-with-float-crash.html
* rendering/bidi.cpp:
(WebCore::RenderBlock::layoutInlineChildren): Added a null check for
the case where the block contains no in-flow elements but still lays
out as a line flow, which can happen as a result of empty generated
content.
LayoutTests:
Reviewed by Oliver Hunt.
- test for http://bugs.webkit.org/show_bug.cgi?id=17988
REGRESSION (r31114-31132): Crash in InlineBox::isDirty() opening chowhound.com
* fast/css-generated-content/empty-content-with-float-crash-expected.txt: Added.
* fast/css-generated-content/empty-content-with-float-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorerenderingbidicpp">trunk/WebCore/rendering/bidi.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssgeneratedcontentemptycontentwithfloatcrashexpectedtxt">trunk/LayoutTests/fast/css-generated-content/empty-content-with-float-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgeneratedcontentemptycontentwithfloatcrashhtml">trunk/LayoutTests/fast/css-generated-content/empty-content-with-float-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (31226 => 31227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2008-03-22 04:59:20 UTC (rev 31226)
+++ trunk/LayoutTests/ChangeLog 2008-03-22 06:57:28 UTC (rev 31227)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2008-03-21 Dan Bernstein <mitz@apple.com>
+
+ Reviewed by Oliver Hunt.
+
+ - test for http://bugs.webkit.org/show_bug.cgi?id=17988
+ REGRESSION (r31114-31132): Crash in InlineBox::isDirty() opening chowhound.com
+
+ * fast/css-generated-content/empty-content-with-float-crash-expected.txt: Added.
+ * fast/css-generated-content/empty-content-with-float-crash.html: Added.
+
</ins><span class="cx"> 2008-03-21 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Geoff Garen.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgeneratedcontentemptycontentwithfloatcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-generated-content/empty-content-with-float-crash-expected.txt (0 => 31227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-generated-content/empty-content-with-float-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-generated-content/empty-content-with-float-crash-expected.txt 2008-03-22 06:57:28 UTC (rev 31227)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+Test for http://bugs.webkit.org/show_bug.cgi?id=17988 REGRESSION (r31114-31132): Crash in InlineBox::isDirty() opening chowhound.com.
+
+No crash means PASS.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssgeneratedcontentemptycontentwithfloatcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-generated-content/empty-content-with-float-crash.html (0 => 31227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-generated-content/empty-content-with-float-crash.html (rev 0)
+++ trunk/LayoutTests/fast/css-generated-content/empty-content-with-float-crash.html 2008-03-22 06:57:28 UTC (rev 31227)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+</script>
+<style>
+ span::after {content: ''; }
+</style>
+<p>
+ Test for <i><a href="http://bugs.webkit.org/show_bug.cgi?id=17988">http://bugs.webkit.org/show_bug.cgi?id=17988</a>
+ REGRESSION (r31114-31132): Crash in InlineBox::isDirty() opening chowhound.com</i>.
+</p>
+<p>
+ No crash means PASS.
+</p>
+<span>
+ <div style="float: left;"></div>
+</span>
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (31226 => 31227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2008-03-22 04:59:20 UTC (rev 31226)
+++ trunk/WebCore/ChangeLog 2008-03-22 06:57:28 UTC (rev 31227)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2008-03-21 Dan Bernstein <mitz@apple.com>
+
+ Reviewed by Oliver Hunt.
+
+ - fix http://bugs.webkit.org/show_bug.cgi?id=17988
+ REGRESSION (r31114-31132): Crash in InlineBox::isDirty() opening chowhound.com
+
+ Test: fast/css-generated-content/empty-content-with-float-crash.html
+
+ * rendering/bidi.cpp:
+ (WebCore::RenderBlock::layoutInlineChildren): Added a null check for
+ the case where the block contains no in-flow elements but still lays
+ out as a line flow, which can happen as a result of empty generated
+ content.
+
</ins><span class="cx"> 2008-03-21 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Reviewed by Oliver Hunt.
</span></span></pre></div>
<a id="trunkWebCorerenderingbidicpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/bidi.cpp (31226 => 31227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/bidi.cpp 2008-03-22 04:59:20 UTC (rev 31226)
+++ trunk/WebCore/rendering/bidi.cpp 2008-03-22 06:57:28 UTC (rev 31227)
</span><span class="lines">@@ -939,7 +939,7 @@
</span><span class="cx"> newLine(clear);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_floatingObjects) {
</del><ins>+ if (m_floatingObjects && lastRootBox()) {
</ins><span class="cx"> if (lastFloat) {
</span><span class="cx"> for (FloatingObject* f = m_floatingObjects->last(); f != lastFloat; f = m_floatingObjects->prev()) {
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>