<!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>[208555] 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/208555">208555</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-11-10 11:44:51 -0800 (Thu, 10 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderElement::invalidateFlowThreadContainingBlockIncludingDescendants should be on RenderBlock.
https://bugs.webkit.org/show_bug.cgi?id=164601
Reviewed by Simon Fraser.
FlowThread containing blocks are cached at RenderBlocks. It makes no sense to call the invalidate function on a RenderElement.
Move invalidateFlowThreadContainingBlockIncludingDescendants to RenderBlock.
No change in functionality.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::invalidateFlowThreadContainingBlockIncludingDescendants):
* rendering/RenderBlock.h:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::invalidateFlowThreadContainingBlockIncludingDescendants): Deleted.
* rendering/RenderElement.h:
* 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="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</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 (208554 => 208555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-10 19:43:05 UTC (rev 208554)
+++ trunk/Source/WebCore/ChangeLog 2016-11-10 19:44:51 UTC (rev 208555)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-11-10 Zalan Bujtas <zalan@apple.com>
+
+ RenderElement::invalidateFlowThreadContainingBlockIncludingDescendants should be on RenderBlock.
+ https://bugs.webkit.org/show_bug.cgi?id=164601
+
+ Reviewed by Simon Fraser.
+
+ FlowThread containing blocks are cached at RenderBlocks. It makes no sense to call the invalidate function on a RenderElement.
+ Move invalidateFlowThreadContainingBlockIncludingDescendants to RenderBlock.
+
+ No change in functionality.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::invalidateFlowThreadContainingBlockIncludingDescendants):
+ * rendering/RenderBlock.h:
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::invalidateFlowThreadContainingBlockIncludingDescendants): Deleted.
+ * rendering/RenderElement.h:
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::splitInlines):
+
</ins><span class="cx"> 2016-11-10 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Local file restrictions should not block sessionStorage access.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (208554 => 208555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-11-10 19:43:05 UTC (rev 208554)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-11-10 19:44:51 UTC (rev 208555)
</span><span class="lines">@@ -3377,6 +3377,28 @@
</span><span class="cx"> return rareData->m_flowThreadContainingBlock.value();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderBlock::invalidateFlowThreadContainingBlockIncludingDescendants()
+{
+ if (flowThreadState() == NotInsideFlowThread)
+ return;
+
+ if (cachedFlowThreadContainingBlockNeedsUpdate())
+ return;
+
+ auto* flowThread = cachedFlowThreadContainingBlock();
+ setCachedFlowThreadContainingBlockNeedsUpdate();
+
+ if (flowThread)
+ flowThread->removeFlowChildInfo(this);
+
+ for (auto& child : childrenOfType<RenderElement>(*this)) {
+ if (flowThread)
+ flowThread->removeFlowChildInfo(&child);
+ if (is<RenderBlock>(child))
+ downcast<RenderBlock>(child).invalidateFlowThreadContainingBlockIncludingDescendants();
+ }
+}
+
</ins><span class="cx"> LayoutUnit RenderBlock::paginationStrut() const
</span><span class="cx"> {
</span><span class="cx"> RenderBlockRareData* rareData = getBlockRareData(this);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (208554 => 208555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2016-11-10 19:43:05 UTC (rev 208554)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2016-11-10 19:44:51 UTC (rev 208555)
</span><span class="lines">@@ -307,6 +307,7 @@
</span><span class="cx"> RenderFlowThread* cachedFlowThreadContainingBlock() const;
</span><span class="cx"> void setCachedFlowThreadContainingBlockNeedsUpdate();
</span><span class="cx"> virtual bool cachedFlowThreadContainingBlockNeedsUpdate() const;
</span><ins>+ void invalidateFlowThreadContainingBlockIncludingDescendants();
</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 (208554 => 208555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-11-10 19:43:05 UTC (rev 208554)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-11-10 19:44:51 UTC (rev 208555)
</span><span class="lines">@@ -2237,31 +2237,6 @@
</span><span class="cx"> setFlowThreadState(NotInsideFlowThread);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderElement::invalidateFlowThreadContainingBlockIncludingDescendants(RenderFlowThread* flowThread)
-{
- if (flowThreadState() == NotInsideFlowThread)
- return;
-
- if (is<RenderBlock>(*this)) {
- RenderBlock& block = downcast<RenderBlock>(*this);
-
- if (block.cachedFlowThreadContainingBlockNeedsUpdate())
- return;
-
- flowThread = block.cachedFlowThreadContainingBlock();
- block.setCachedFlowThreadContainingBlockNeedsUpdate();
- }
-
- if (flowThread)
- flowThread->removeFlowChildInfo(this);
-
- if (!is<RenderElement>(*this))
- return;
-
- for (auto& child : childrenOfType<RenderElement>(*this))
- child.invalidateFlowThreadContainingBlockIncludingDescendants(flowThread);
-}
-
</del><span class="cx"> #if ENABLE(TEXT_AUTOSIZING)
</span><span class="cx"> static RenderObject::BlockContentHeightType includeNonFixedHeight(const RenderObject& renderer)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (208554 => 208555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2016-11-10 19:43:05 UTC (rev 208554)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2016-11-10 19:44:51 UTC (rev 208555)
</span><span class="lines">@@ -224,7 +224,6 @@
</span><span class="cx"> RespectImageOrientationEnum shouldRespectImageOrientation() const;
</span><span class="cx">
</span><span class="cx"> void removeFromRenderFlowThread();
</span><del>- void invalidateFlowThreadContainingBlockIncludingDescendants(RenderFlowThread* = nullptr);
</del><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> enum BaseTypeFlag {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (208554 => 208555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2016-11-10 19:43:05 UTC (rev 208554)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2016-11-10 19:44:51 UTC (rev 208555)
</span><span class="lines">@@ -522,7 +522,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Clear the flow thread containing blocks cached during the detached state insertions.
</span><del>- cloneInline->invalidateFlowThreadContainingBlockIncludingDescendants();
</del><ins>+ for (auto& cloneBlockChild : childrenOfType<RenderBlock>(*cloneInline))
+ cloneBlockChild.invalidateFlowThreadContainingBlockIncludingDescendants();
</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>