<!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>[169189] 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/169189">169189</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-05-21 23:12:34 -0700 (Wed, 21 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/167870">r167870</a>): Crash in simple line layout code with :after
https://bugs.webkit.org/show_bug.cgi?id=133155
Source/WebCore:
<rdar://problem/16977696>
Reviewed by Darin Adler.
Fix https://bugs.webkit.org/show_bug.cgi?id=132241 in a safer way.
The underline behavior is tested by the existing fast/text/simple-lines-hover-underline.html
Test: fast/text/simple-lines-hover-after.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::invalidateLineLayoutPath): Deleted.
Move to RenderBlockFlow.
* rendering/RenderBlock.h:
(WebCore::RenderBlock::invalidateLineLayoutPath):
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::styleDidChange):
Invalidate layout if style changes in a manner that makes us ineligible to use the simple line layout path.
(WebCore::RenderBlockFlow::invalidateLineLayoutPath):
Drop the simple line layout on path invalidation if it exists. It may not be valid anymore.
Also invalidate the layout if this happens so we'll reconstruct the lines later.
(WebCore::RenderBlockFlow::simpleLineLayout): Deleted.
(WebCore::RenderBlockFlow::ensureLineBoxes):
(WebCore::RenderBlockFlow::createLineBoxes): Deleted.
Revert some of the changes made it <a href="http://trac.webkit.org/projects/webkit/changeset/167870">r167870</a>.
* rendering/RenderBlockFlow.h:
(WebCore::RenderBlockFlow::simpleLineLayout):
Add strong validity assert.
LayoutTests:
Reviewed by Darin Adler.
* fast/text/simple-lines-hover-after-expected.html: Added.
* fast/text/simple-lines-hover-after.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="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockh">trunk/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowh">trunk/Source/WebCore/rendering/RenderBlockFlow.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextsimplelineshoverafterexpectedhtml">trunk/LayoutTests/fast/text/simple-lines-hover-after-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelineshoverafterhtml">trunk/LayoutTests/fast/text/simple-lines-hover-after.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169188 => 169189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-22 04:11:15 UTC (rev 169188)
+++ trunk/LayoutTests/ChangeLog 2014-05-22 06:12:34 UTC (rev 169189)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-05-21 Antti Koivisto <antti@apple.com>
+
+ REGRESSION(r167870): Crash in simple line layout code with :after
+ https://bugs.webkit.org/show_bug.cgi?id=133155
+
+ Reviewed by Darin Adler.
+
+ * fast/text/simple-lines-hover-after-expected.html: Added.
+ * fast/text/simple-lines-hover-after.html: Added.
+
</ins><span class="cx"> 2014-05-21 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed Mac gardening after r169161.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelineshoverafterexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-lines-hover-after-expected.html (0 => 169189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-lines-hover-after-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-lines-hover-after-expected.html 2014-05-22 06:12:34 UTC (rev 169189)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+target after
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelineshoverafterhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-lines-hover-after.html (0 => 169189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-lines-hover-after.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-lines-hover-after.html 2014-05-22 06:12:34 UTC (rev 169189)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<style>
+a { display: none; }
+a:after { content: "after"; }
+div:hover a { display: inline-block }
+</style>
+<script>
+function test()
+{
+ var target = document.getElementById("target");
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+ if (window.eventSender)
+ eventSender.mouseMoveTo(target.offsetLeft + 10, target.offsetTop + 10);
+}
+function done()
+{
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+</script>
+<body onload="test()">
+<div id="target" onmouseenter="done()">target <a></a></div>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169188 => 169189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-22 04:11:15 UTC (rev 169188)
+++ trunk/Source/WebCore/ChangeLog 2014-05-22 06:12:34 UTC (rev 169189)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2014-05-21 Antti Koivisto <antti@apple.com>
+
+ REGRESSION(r167870): Crash in simple line layout code with :after
+ https://bugs.webkit.org/show_bug.cgi?id=133155
+ <rdar://problem/16977696>
+
+ Reviewed by Darin Adler.
+
+ Fix https://bugs.webkit.org/show_bug.cgi?id=132241 in a safer way.
+ The underline behavior is tested by the existing fast/text/simple-lines-hover-underline.html
+
+ Test: fast/text/simple-lines-hover-after.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::invalidateLineLayoutPath): Deleted.
+
+ Move to RenderBlockFlow.
+
+ * rendering/RenderBlock.h:
+ (WebCore::RenderBlock::invalidateLineLayoutPath):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::styleDidChange):
+
+ Invalidate layout if style changes in a manner that makes us ineligible to use the simple line layout path.
+
+ (WebCore::RenderBlockFlow::invalidateLineLayoutPath):
+
+ Drop the simple line layout on path invalidation if it exists. It may not be valid anymore.
+ Also invalidate the layout if this happens so we'll reconstruct the lines later.
+
+ (WebCore::RenderBlockFlow::simpleLineLayout): Deleted.
+ (WebCore::RenderBlockFlow::ensureLineBoxes):
+ (WebCore::RenderBlockFlow::createLineBoxes): Deleted.
+
+ Revert some of the changes made it r167870.
+
+ * rendering/RenderBlockFlow.h:
+ (WebCore::RenderBlockFlow::simpleLineLayout):
+
+ Add strong validity assert.
+
</ins><span class="cx"> 2014-05-21 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] two media control button strings are not localized
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (169188 => 169189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-05-22 04:11:15 UTC (rev 169188)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-05-22 06:12:34 UTC (rev 169189)
</span><span class="lines">@@ -626,13 +626,6 @@
</span><span class="cx"> cache->recomputeIsIgnored(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBlock::invalidateLineLayoutPath()
-{
- if (m_lineLayoutPath == ForceLineBoxesPath)
- return;
- m_lineLayoutPath = UndeterminedPath;
-}
-
</del><span class="cx"> void RenderBlock::makeChildrenNonInline(RenderObject* insertionPoint)
</span><span class="cx"> {
</span><span class="cx"> // makeChildrenNonInline takes a block whose children are *all* inline and it
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (169188 => 169189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2014-05-22 04:11:15 UTC (rev 169188)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2014-05-22 06:12:34 UTC (rev 169189)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0);
</span><span class="cx">
</span><del>- void invalidateLineLayoutPath();
</del><ins>+ virtual void invalidateLineLayoutPath() { }
</ins><span class="cx">
</span><span class="cx"> void insertPositionedObject(RenderBox&);
</span><span class="cx"> static void removePositionedObject(RenderBox&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (169188 => 169189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-05-22 04:11:15 UTC (rev 169188)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-05-22 06:12:34 UTC (rev 169189)
</span><span class="lines">@@ -1962,9 +1962,12 @@
</span><span class="cx"> if (auto fragment = renderNamedFlowFragment())
</span><span class="cx"> fragment->setStyle(RenderNamedFlowFragment::createStyle(style()));
</span><span class="cx">
</span><del>- if (diff >= StyleDifferenceRepaint)
- invalidateLineLayoutPath();
-
</del><ins>+ if (diff >= StyleDifferenceRepaint) {
+ // FIXME: This could use a cheaper style-only test instead of SimpleLineLayout::canUseFor.
+ if (selfNeedsLayout() || !m_simpleLineLayout || !SimpleLineLayout::canUseFor(*this))
+ invalidateLineLayoutPath();
+ }
+
</ins><span class="cx"> if (multiColumnFlowThread()) {
</span><span class="cx"> for (auto child = firstChildBox();
</span><span class="cx"> child && (child->isInFlowRenderFlowThread() || child->isRenderMultiColumnSet());
</span><span class="lines">@@ -3390,6 +3393,27 @@
</span><span class="cx"> return lineBoxes().firstLineBox();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderBlockFlow::invalidateLineLayoutPath()
+{
+ switch (m_lineLayoutPath) {
+ case UndeterminedPath:
+ case ForceLineBoxesPath:
+ ASSERT(!m_simpleLineLayout);
+ return;
+ case LineBoxesPath:
+ ASSERT(!m_simpleLineLayout);
+ m_lineLayoutPath = UndeterminedPath;
+ return;
+ case SimpleLinesPath:
+ // The simple line layout may have become invalid.
+ m_simpleLineLayout = nullptr;
+ setNeedsLayout();
+ m_lineLayoutPath = UndeterminedPath;
+ return;
+ }
+ ASSERT_NOT_REACHED();
+}
+
</ins><span class="cx"> void RenderBlockFlow::layoutSimpleLines(LayoutUnit& repaintLogicalTop, LayoutUnit& repaintLogicalBottom)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_lineBoxes.firstLineBox());
</span><span class="lines">@@ -3412,28 +3436,9 @@
</span><span class="cx"> toRenderText(firstChild())->deleteLineBoxesBeforeSimpleLineLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const SimpleLineLayout::Layout* RenderBlockFlow::simpleLineLayout() const
-{
- if (m_lineLayoutPath == UndeterminedPath)
- const_cast<RenderBlockFlow&>(*this).m_lineLayoutPath = SimpleLineLayout::canUseFor(*this) ? SimpleLinesPath : LineBoxesPath;
-
- if (m_lineLayoutPath == SimpleLinesPath)
- return m_simpleLineLayout.get();
-
- const_cast<RenderBlockFlow&>(*this).createLineBoxes();
- return nullptr;
-}
-
</del><span class="cx"> void RenderBlockFlow::ensureLineBoxes()
</span><span class="cx"> {
</span><span class="cx"> m_lineLayoutPath = ForceLineBoxesPath;
</span><del>- createLineBoxes();
-}
-
-void RenderBlockFlow::createLineBoxes()
-{
- ASSERT(m_lineLayoutPath == LineBoxesPath || m_lineLayoutPath == ForceLineBoxesPath);
-
</del><span class="cx"> if (!m_simpleLineLayout)
</span><span class="cx"> return;
</span><span class="cx"> m_simpleLineLayout = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (169188 => 169189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2014-05-22 04:11:15 UTC (rev 169188)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2014-05-22 06:12:34 UTC (rev 169189)
</span><span class="lines">@@ -347,6 +347,7 @@
</span><span class="cx"> RootInlineBox* lastRootBox() const { return toRootInlineBox(m_lineBoxes.lastLineBox()); }
</span><span class="cx">
</span><span class="cx"> virtual bool hasLines() const override final;
</span><ins>+ virtual void invalidateLineLayoutPath() override final;
</ins><span class="cx">
</span><span class="cx"> // Helper methods for computing line counts and heights for line counts.
</span><span class="cx"> RootInlineBox* lineAtIndex(int) const;
</span><span class="lines">@@ -525,8 +526,6 @@
</span><span class="cx"> virtual VisiblePosition positionForPointWithInlineChildren(const LayoutPoint& pointInLogicalContents, const RenderRegion*) override;
</span><span class="cx"> virtual void addFocusRingRectsForInlineChildren(Vector<IntRect>& rects, const LayoutPoint& additionalOffset, const RenderLayerModelObject*) override;
</span><span class="cx">
</span><del>- void createLineBoxes();
-
</del><span class="cx"> // FIXME-BLOCKFLOW: These methods have implementations in
</span><span class="cx"> // RenderBlockLineLayout. They should be moved to the proper header once the
</span><span class="cx"> // line layout code is separated from RenderBlock and RenderBlockFlow.
</span><span class="lines">@@ -629,6 +628,12 @@
</span><span class="cx"> return isRenderBlockFlow() && toRenderBlockFlow(this)->renderNamedFlowFragment();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline const SimpleLineLayout::Layout* RenderBlockFlow::simpleLineLayout() const
+{
+ ASSERT(m_lineLayoutPath == SimpleLinesPath || !m_simpleLineLayout);
+ return m_simpleLineLayout.get();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // RenderBlockFlow_h
</span></span></pre>
</div>
</div>
</body>
</html>