<!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>[175352] 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/175352">175352</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-10-29 16:02:10 -0700 (Wed, 29 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Generalize dirtying of parent's line boxes when taking a renderer out of tree.
<https://webkit.org/b/138152>
Reviewed by Antti Koivisto.
Instead of calling dirtyLinesFromChangedChild() when certain types of renderers
are about to be destroyed, always do this in RenderElement::willBeRemovedFromTree().
This is part of an effort to make render tree teardown less incomprehensible.
We still don't bother at all if we're in the process of tearing down the entire
render tree, since that would be a waste of time.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::willBeDestroyed):
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::willBeDestroyed):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::willBeRemovedFromTree):
* rendering/RenderInline.cpp:
(WebCore::RenderInline::willBeDestroyed):
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::willBeDestroyed): Deleted.
* rendering/RenderReplaced.h:</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="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</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>
<li><a href="#trunkSourceWebCorerenderingRenderReplacedcpp">trunk/Source/WebCore/rendering/RenderReplaced.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderReplacedh">trunk/Source/WebCore/rendering/RenderReplaced.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175351 => 175352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-29 22:59:15 UTC (rev 175351)
+++ trunk/Source/WebCore/ChangeLog 2014-10-29 23:02:10 UTC (rev 175352)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-10-29 Andreas Kling <akling@apple.com>
+
+ Generalize dirtying of parent's line boxes when taking a renderer out of tree.
+ <https://webkit.org/b/138152>
+
+ Reviewed by Antti Koivisto.
+
+ Instead of calling dirtyLinesFromChangedChild() when certain types of renderers
+ are about to be destroyed, always do this in RenderElement::willBeRemovedFromTree().
+
+ This is part of an effort to make render tree teardown less incomprehensible.
+
+ We still don't bother at all if we're in the process of tearing down the entire
+ render tree, since that would be a waste of time.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::willBeDestroyed):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::willBeDestroyed):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::willBeRemovedFromTree):
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::willBeDestroyed):
+ * rendering/RenderReplaced.cpp:
+ (WebCore::RenderReplaced::willBeDestroyed): Deleted.
+ * rendering/RenderReplaced.h:
+
</ins><span class="cx"> 2014-10-28 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement WKPageSetMuted(bool).
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (175351 => 175352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-10-29 22:59:15 UTC (rev 175351)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-10-29 23:02:10 UTC (rev 175352)
</span><span class="lines">@@ -242,11 +242,6 @@
</span><span class="cx"> // properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise.
</span><span class="cx"> destroyLeftoverChildren();
</span><span class="cx">
</span><del>- if (!documentBeingDestroyed()) {
- if (parent())
- parent()->dirtyLinesFromChangedChild(*this);
- }
-
</del><span class="cx"> removeFromUpdateScrollInfoAfterLayoutTransaction();
</span><span class="cx">
</span><span class="cx"> RenderBox::willBeDestroyed();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (175351 => 175352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-10-29 22:59:15 UTC (rev 175351)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-10-29 23:02:10 UTC (rev 175352)
</span><span class="lines">@@ -166,8 +166,7 @@
</span><span class="cx"> childBox->removeFromParent();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } else if (parent())
- parent()->dirtyLinesFromChangedChild(*this);
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_lineBoxes.deleteLineBoxes();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (175351 => 175352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-10-29 22:59:15 UTC (rev 175351)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-10-29 23:02:10 UTC (rev 175352)
</span><span class="lines">@@ -1041,7 +1041,7 @@
</span><span class="cx"> if (m_style->hasFixedBackgroundImage() && !frame().settings().fixedBackgroundsPaintRelativeToDocument())
</span><span class="cx"> view().frameView().removeSlowRepaintObject(this);
</span><span class="cx">
</span><del>- if (isOutOfFlowPositioned() && parent()->childrenInline())
</del><ins>+ if (!documentBeingDestroyed())
</ins><span class="cx"> parent()->dirtyLinesFromChangedChild(*this);
</span><span class="cx">
</span><span class="cx"> if (auto* containerFlowThread = parent()->renderNamedFlowThreadWrapper())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (175351 => 175352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2014-10-29 22:59:15 UTC (rev 175351)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2014-10-29 23:02:10 UTC (rev 175352)
</span><span class="lines">@@ -98,8 +98,7 @@
</span><span class="cx"> for (auto box = firstLineBox(); box; box = box->nextLineBox())
</span><span class="cx"> box->removeFromParent();
</span><span class="cx"> }
</span><del>- } else if (parent())
- parent()->dirtyLinesFromChangedChild(*this);
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_lineBoxes.deleteLineBoxes();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderReplacedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (175351 => 175352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2014-10-29 22:59:15 UTC (rev 175351)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2014-10-29 23:02:10 UTC (rev 175352)
</span><span class="lines">@@ -71,14 +71,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderReplaced::willBeDestroyed()
-{
- if (!documentBeingDestroyed() && parent())
- parent()->dirtyLinesFromChangedChild(*this);
-
- RenderBox::willBeDestroyed();
-}
-
</del><span class="cx"> void RenderReplaced::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
</span><span class="cx"> {
</span><span class="cx"> RenderBox::styleDidChange(diff, oldStyle);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderReplacedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderReplaced.h (175351 => 175352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderReplaced.h 2014-10-29 22:59:15 UTC (rev 175351)
+++ trunk/Source/WebCore/rendering/RenderReplaced.h 2014-10-29 23:02:10 UTC (rev 175352)
</span><span class="lines">@@ -43,8 +43,6 @@
</span><span class="cx"> RenderReplaced(Element&, PassRef<RenderStyle>, const LayoutSize& intrinsicSize);
</span><span class="cx"> RenderReplaced(Document&, PassRef<RenderStyle>, const LayoutSize& intrinsicSize);
</span><span class="cx">
</span><del>- virtual void willBeDestroyed() override;
-
</del><span class="cx"> virtual void layout() override;
</span><span class="cx">
</span><span class="cx"> virtual LayoutSize intrinsicSize() const override final { return m_intrinsicSize; }
</span></span></pre>
</div>
</div>
</body>
</html>