<!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>[208605] trunk/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/208605">208605</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-11-11 13:20:01 -0800 (Fri, 11 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderFlowThread's containing block cache should be invalidated before calling styleDidChange.
https://bugs.webkit.org/show_bug.cgi?id=164646
Reviewed by Simon Fraser.
We have to invalidate the containing block cache for RenderFlowThreads soon after the containing block context
changes. Invalidating it in RenderBlock::styleDidChange is too late since we might run some code in some
of the subclasses that use this stale containing block cache.
No known behaviour change.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::styleDidChange): This change could trigger double invalidation.
However running this code twice shouldn't impact performance greatly.
(WebCore::RenderBlock::resetFlowThreadContainingBlockAndChildInfoIncludingDescendants):
(WebCore::RenderBlock::invalidateFlowThreadContainingBlockIncludingDescendants): Deleted.
* rendering/RenderBlock.h:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::setStyle): We don't need to call the invalidation from initializeStyle(), since
we don't yet have cache at that point.
* rendering/RenderInline.cpp:
(WebCore::RenderInline::splitInlines):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderInlinecpp">trunk/Source/WebCore/rendering/RenderInline.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208604 => 208605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-11 20:38:57 UTC (rev 208604)
+++ trunk/Source/WebCore/ChangeLog 2016-11-11 21:20:01 UTC (rev 208605)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-11-11 Zalan Bujtas <zalan@apple.com>
+
+ RenderFlowThread's containing block cache should be invalidated before calling styleDidChange.
+ https://bugs.webkit.org/show_bug.cgi?id=164646
+
+ Reviewed by Simon Fraser.
+
+ We have to invalidate the containing block cache for RenderFlowThreads soon after the containing block context
+ changes. Invalidating it in RenderBlock::styleDidChange is too late since we might run some code in some
+ of the subclasses that use this stale containing block cache.
+
+ No known behaviour change.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::styleDidChange): This change could trigger double invalidation.
+ However running this code twice shouldn't impact performance greatly.
+ (WebCore::RenderBlock::resetFlowThreadContainingBlockAndChildInfoIncludingDescendants):
+ (WebCore::RenderBlock::invalidateFlowThreadContainingBlockIncludingDescendants): Deleted.
+ * rendering/RenderBlock.h:
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::setStyle): We don't need to call the invalidation from initializeStyle(), since
+ we don't yet have cache at that point.
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::splitInlines):
+
</ins><span class="cx"> 2016-11-11 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Move Node from ExceptionCode to ExceptionOr
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (208604 => 208605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-11-11 20:38:57 UTC (rev 208604)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-11-11 21:20:01 UTC (rev 208605)
</span><span class="lines">@@ -423,20 +423,13 @@
</span><span class="cx">
</span><span class="cx"> void RenderBlock::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
</span><span class="cx"> {
</span><del>- auto& newStyle = style();
-
</del><span class="cx"> bool hadTransform = hasTransform();
</span><del>- bool flowThreadContainingBlockInvalidated = false;
- if (oldStyle && oldStyle->position() != newStyle.position()) {
- invalidateFlowThreadContainingBlockIncludingDescendants();
- flowThreadContainingBlockInvalidated = true;
- }
-
</del><span class="cx"> RenderBox::styleDidChange(diff, oldStyle);
</span><span class="cx">
</span><del>- if (hadTransform != hasTransform() && !flowThreadContainingBlockInvalidated)
- invalidateFlowThreadContainingBlockIncludingDescendants();
</del><ins>+ if (hadTransform != hasTransform())
+ resetFlowThreadContainingBlockAndChildInfoIncludingDescendants();
</ins><span class="cx">
</span><ins>+ auto& newStyle = style();
</ins><span class="cx"> if (!isAnonymousBlock()) {
</span><span class="cx"> // Ensure that all of our continuation blocks pick up the new style.
</span><span class="cx"> for (RenderBlock* currCont = blockElementContinuation(); currCont; currCont = currCont->blockElementContinuation()) {
</span><span class="lines">@@ -3382,7 +3375,7 @@
</span><span class="cx"> return rareData->m_flowThreadContainingBlock.value();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBlock::invalidateFlowThreadContainingBlockIncludingDescendants()
</del><ins>+void RenderBlock::resetFlowThreadContainingBlockAndChildInfoIncludingDescendants()
</ins><span class="cx"> {
</span><span class="cx"> if (flowThreadState() == NotInsideFlowThread)
</span><span class="cx"> return;
</span><span class="lines">@@ -3400,7 +3393,7 @@
</span><span class="cx"> if (flowThread)
</span><span class="cx"> flowThread->removeFlowChildInfo(child);
</span><span class="cx"> if (is<RenderBlock>(child))
</span><del>- downcast<RenderBlock>(child).invalidateFlowThreadContainingBlockIncludingDescendants();
</del><ins>+ downcast<RenderBlock>(child).resetFlowThreadContainingBlockAndChildInfoIncludingDescendants();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (208604 => 208605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2016-11-11 20:38:57 UTC (rev 208604)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2016-11-11 21:20:01 UTC (rev 208605)
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> RenderFlowThread* cachedFlowThreadContainingBlock() const;
</span><span class="cx"> void setCachedFlowThreadContainingBlockNeedsUpdate();
</span><span class="cx"> virtual bool cachedFlowThreadContainingBlockNeedsUpdate() const;
</span><del>- void invalidateFlowThreadContainingBlockIncludingDescendants();
</del><ins>+ void resetFlowThreadContainingBlockAndChildInfoIncludingDescendants();
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> RenderFlowThread* locateFlowThreadContainingBlock() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (208604 => 208605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-11-11 20:38:57 UTC (rev 208604)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-11-11 21:20:01 UTC (rev 208605)
</span><span class="lines">@@ -408,6 +408,12 @@
</span><span class="cx"> auto oldStyle = WTFMove(m_style);
</span><span class="cx"> m_style = WTFMove(style);
</span><span class="cx"> bool detachedFromParent = !parent();
</span><ins>+
+ // Make sure we invalidate the containing block cache for flows when the contianing block context changes
+ // so that styleDidChange can safely use RenderBlock::locateFlowThreadContainingBlock()
+ if (is<RenderBlock>(*this) && oldStyle.position() != m_style.position())
+ downcast<RenderBlock>(*this).resetFlowThreadContainingBlockAndChildInfoIncludingDescendants();
+
</ins><span class="cx"> styleDidChange(diff, &oldStyle);
</span><span class="cx">
</span><span class="cx"> // Text renderers use their parent style. Notify them about the change.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (208604 => 208605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2016-11-11 20:38:57 UTC (rev 208604)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2016-11-11 21:20:01 UTC (rev 208605)
</span><span class="lines">@@ -523,7 +523,7 @@
</span><span class="cx">
</span><span class="cx"> // Clear the flow thread containing blocks cached during the detached state insertions.
</span><span class="cx"> for (auto& cloneBlockChild : childrenOfType<RenderBlock>(*cloneInline))
</span><del>- cloneBlockChild.invalidateFlowThreadContainingBlockIncludingDescendants();
</del><ins>+ cloneBlockChild.resetFlowThreadContainingBlockAndChildInfoIncludingDescendants();
</ins><span class="cx">
</span><span class="cx"> // Now we are at the block level. We need to put the clone into the toBlock.
</span><span class="cx"> toBlock->insertChildInternal(cloneInline.leakPtr(), nullptr, NotifyChildren);
</span></span></pre>
</div>
</div>
</body>
</html>