<!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>[214082] 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/214082">214082</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-03-16 17:20:45 -0700 (Thu, 16 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderView::documentBeingDestroyed() needs a new name.
https://bugs.webkit.org/show_bug.cgi?id=166727
Reviewed by Andreas Kling.
Now that we destroy the render tree for documents going into the page cache, RenderView::documentBeingDestroyed()
is misleadingly named. Rename it to renderTreeBeingDestroyed() and fix all callers.
* page/FrameView.cpp:
(WebCore::FrameView::scheduleRelayoutOfSubtree):
* page/scrolling/ScrollingCoordinator.cpp:
(WebCore::ScrollingCoordinator::absoluteEventTrackingRegionsForFrame):
* rendering/CounterNode.cpp:
(WebCore::CounterNode::resetRenderers):
* rendering/ImageQualityController.cpp:
(WebCore::ImageQualityController::highQualityRepaintTimerFired):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::willBeDestroyed):
(WebCore::canMergeContiguousAnonymousBlocks):
(WebCore::RenderBlock::removeChild):
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::willBeDestroyed):
(WebCore::RenderBlockFlow::removeChild):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::removeFloatingOrPositionedChildFromBlockLists):
(WebCore::RenderBox::deleteLineBoxWrapper):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::willBeDestroyed):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::insertChildInternal):
(WebCore::RenderElement::removeChildInternal):
(WebCore::RenderElement::clearLayoutRootIfNeeded):
(WebCore::RenderElement::willBeDestroyed):
* rendering/RenderImage.cpp:
(WebCore::RenderImage::imageChanged):
(WebCore::RenderImage::notifyFinished):
* rendering/RenderInline.cpp:
(WebCore::RenderInline::willBeDestroyed):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::removeChild):
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::notifyFlushRequired):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::layerWillBeRemoved):
(WebCore::RenderLayerCompositor::fixedRootBackgroundLayerChanged):
* rendering/RenderLineBreak.cpp:
(WebCore::RenderLineBreak::deleteInlineBoxWrapper):
* rendering/RenderNamedFlowFragment.cpp:
(WebCore::RenderNamedFlowFragment::attachRegion):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::resetFlowThreadStateOnRemoval):
(WebCore::RenderObject::willBeDestroyed):
(WebCore::RenderObject::destroyAndCleanupAnonymousWrappers):
* rendering/RenderObject.h:
(WebCore::RenderObject::renderTreeBeingDestroyed):
(WebCore::RenderObject::documentBeingDestroyed): Deleted.
* rendering/RenderQuote.cpp:
(WebCore::RenderQuote::detachQuote):
* rendering/RenderRegion.cpp:
(WebCore::RenderRegion::attachRegion):
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::willBeDestroyed):
* rendering/RenderRubyRun.cpp:
(WebCore::RenderRubyRun::removeChild):
* rendering/RenderTable.h:
(WebCore::RenderTable::setNeedsSectionRecalc):
* rendering/RenderText.cpp:
(WebCore::RenderText::removeAndDestroyTextBoxes):
* rendering/RenderVideo.cpp:
(WebCore::RenderVideo::updatePlayer):
* rendering/svg/RenderSVGResource.cpp:
(WebCore::RenderSVGResource::markForLayoutAndParentResourceInvalidation):
* rendering/svg/RenderSVGResourceContainer.cpp:
(WebCore::RenderSVGResourceContainer::markClientForInvalidation):
* rendering/svg/RenderSVGText.cpp:
(WebCore::RenderSVGText::subtreeChildWasAdded):
(WebCore::RenderSVGText::subtreeChildWillBeRemoved):
(WebCore::RenderSVGText::subtreeChildWasRemoved):
(WebCore::RenderSVGText::subtreeStyleDidChange):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingCounterNodecpp">trunk/Source/WebCore/rendering/CounterNode.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingImageQualityControllercpp">trunk/Source/WebCore/rendering/ImageQualityController.cpp</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="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderInlinecpp">trunk/Source/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLineBreakcpp">trunk/Source/WebCore/rendering/RenderLineBreak.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp">trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderQuotecpp">trunk/Source/WebCore/rendering/RenderQuote.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRegioncpp">trunk/Source/WebCore/rendering/RenderRegion.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderReplacedcpp">trunk/Source/WebCore/rendering/RenderReplaced.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderRubyRuncpp">trunk/Source/WebCore/rendering/RenderRubyRun.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableh">trunk/Source/WebCore/rendering/RenderTable.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderVideocpp">trunk/Source/WebCore/rendering/RenderVideo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcecpp">trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceContainercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGTextcpp">trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/ChangeLog        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -1,3 +1,86 @@
</span><ins>+2017-03-16 Simon Fraser <simon.fraser@apple.com>
+
+ RenderView::documentBeingDestroyed() needs a new name.
+ https://bugs.webkit.org/show_bug.cgi?id=166727
+
+ Reviewed by Andreas Kling.
+
+ Now that we destroy the render tree for documents going into the page cache, RenderView::documentBeingDestroyed()
+ is misleadingly named. Rename it to renderTreeBeingDestroyed() and fix all callers.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::scheduleRelayoutOfSubtree):
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::ScrollingCoordinator::absoluteEventTrackingRegionsForFrame):
+ * rendering/CounterNode.cpp:
+ (WebCore::CounterNode::resetRenderers):
+ * rendering/ImageQualityController.cpp:
+ (WebCore::ImageQualityController::highQualityRepaintTimerFired):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::willBeDestroyed):
+ (WebCore::canMergeContiguousAnonymousBlocks):
+ (WebCore::RenderBlock::removeChild):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::willBeDestroyed):
+ (WebCore::RenderBlockFlow::removeChild):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::removeFloatingOrPositionedChildFromBlockLists):
+ (WebCore::RenderBox::deleteLineBoxWrapper):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::willBeDestroyed):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::insertChildInternal):
+ (WebCore::RenderElement::removeChildInternal):
+ (WebCore::RenderElement::clearLayoutRootIfNeeded):
+ (WebCore::RenderElement::willBeDestroyed):
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::imageChanged):
+ (WebCore::RenderImage::notifyFinished):
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::willBeDestroyed):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::removeChild):
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::notifyFlushRequired):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::layerWillBeRemoved):
+ (WebCore::RenderLayerCompositor::fixedRootBackgroundLayerChanged):
+ * rendering/RenderLineBreak.cpp:
+ (WebCore::RenderLineBreak::deleteInlineBoxWrapper):
+ * rendering/RenderNamedFlowFragment.cpp:
+ (WebCore::RenderNamedFlowFragment::attachRegion):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::resetFlowThreadStateOnRemoval):
+ (WebCore::RenderObject::willBeDestroyed):
+ (WebCore::RenderObject::destroyAndCleanupAnonymousWrappers):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::renderTreeBeingDestroyed):
+ (WebCore::RenderObject::documentBeingDestroyed): Deleted.
+ * rendering/RenderQuote.cpp:
+ (WebCore::RenderQuote::detachQuote):
+ * rendering/RenderRegion.cpp:
+ (WebCore::RenderRegion::attachRegion):
+ * rendering/RenderReplaced.cpp:
+ (WebCore::RenderReplaced::willBeDestroyed):
+ * rendering/RenderRubyRun.cpp:
+ (WebCore::RenderRubyRun::removeChild):
+ * rendering/RenderTable.h:
+ (WebCore::RenderTable::setNeedsSectionRecalc):
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::removeAndDestroyTextBoxes):
+ * rendering/RenderVideo.cpp:
+ (WebCore::RenderVideo::updatePlayer):
+ * rendering/svg/RenderSVGResource.cpp:
+ (WebCore::RenderSVGResource::markForLayoutAndParentResourceInvalidation):
+ * rendering/svg/RenderSVGResourceContainer.cpp:
+ (WebCore::RenderSVGResourceContainer::markClientForInvalidation):
+ * rendering/svg/RenderSVGText.cpp:
+ (WebCore::RenderSVGText::subtreeChildWasAdded):
+ (WebCore::RenderSVGText::subtreeChildWillBeRemoved):
+ (WebCore::RenderSVGText::subtreeChildWasRemoved):
+ (WebCore::RenderSVGText::subtreeStyleDidChange):
+
</ins><span class="cx"> 2017-03-16 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Wrap legacy WebRTC API in runtime flag
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/page/FrameView.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -3024,7 +3024,7 @@
</span><span class="cx"> const RenderView& renderView = *this->renderView();
</span><span class="cx">
</span><span class="cx"> // Try to catch unnecessary work during render tree teardown.
</span><del>- ASSERT(!renderView.documentBeingDestroyed());
</del><ins>+ ASSERT(!renderView.renderTreeBeingDestroyed());
</ins><span class="cx"> ASSERT(frame().view() == this);
</span><span class="cx">
</span><span class="cx"> // When m_layoutRoot is already set, ignore the renderView's needsLayout bit
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> EventTrackingRegions ScrollingCoordinator::absoluteEventTrackingRegionsForFrame(const Frame& frame) const
</span><span class="cx"> {
</span><span class="cx"> auto* renderView = frame.contentRenderer();
</span><del>- if (!renderView || renderView->documentBeingDestroyed())
</del><ins>+ if (!renderView || renderView->renderTreeBeingDestroyed())
</ins><span class="cx"> return EventTrackingRegions();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingCounterNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/CounterNode.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/CounterNode.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/CounterNode.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_rootRenderer)
</span><span class="cx"> return;
</span><del>- bool skipLayoutAndPerfWidthsRecalc = m_rootRenderer->documentBeingDestroyed();
</del><ins>+ bool skipLayoutAndPerfWidthsRecalc = m_rootRenderer->renderTreeBeingDestroyed();
</ins><span class="cx"> auto* current = m_rootRenderer;
</span><span class="cx"> while (current) {
</span><span class="cx"> if (!skipLayoutAndPerfWidthsRecalc)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingImageQualityControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/ImageQualityController.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/ImageQualityController.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/ImageQualityController.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> void ImageQualityController::highQualityRepaintTimerFired()
</span><span class="cx"> {
</span><del>- if (m_renderView.documentBeingDestroyed())
</del><ins>+ if (m_renderView.renderTreeBeingDestroyed())
</ins><span class="cx"> return;
</span><span class="cx"> if (!m_animatedResizeIsActive && !m_liveResizeOptimizationIsActive)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderBlock::willBeDestroyed()
</span><span class="cx"> {
</span><del>- if (!documentBeingDestroyed()) {
</del><ins>+ if (!renderTreeBeingDestroyed()) {
</ins><span class="cx"> if (parent())
</span><span class="cx"> parent()->dirtyLinesFromChangedChild(*this);
</span><span class="cx"> }
</span><span class="lines">@@ -778,7 +778,7 @@
</span><span class="cx">
</span><span class="cx"> static bool canMergeContiguousAnonymousBlocks(RenderObject& oldChild, RenderObject* previous, RenderObject* next)
</span><span class="cx"> {
</span><del>- if (oldChild.documentBeingDestroyed() || oldChild.isInline() || oldChild.virtualContinuation())
</del><ins>+ if (oldChild.renderTreeBeingDestroyed() || oldChild.isInline() || oldChild.virtualContinuation())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (previous) {
</span><span class="lines">@@ -814,7 +814,7 @@
</span><span class="cx"> {
</span><span class="cx"> // No need to waste time in merging or removing empty anonymous blocks.
</span><span class="cx"> // We can just bail out if our document is getting destroyed.
</span><del>- if (documentBeingDestroyed()) {
</del><ins>+ if (renderTreeBeingDestroyed()) {
</ins><span class="cx"> RenderBox::removeChild(oldChild);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -153,7 +153,7 @@
</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()) {
</del><ins>+ if (!renderTreeBeingDestroyed()) {
</ins><span class="cx"> if (firstRootBox()) {
</span><span class="cx"> // We can't wait for RenderBox::destroy to clear the selection,
</span><span class="cx"> // because by then we will have nuked the line boxes.
</span><span class="lines">@@ -3926,7 +3926,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderBlockFlow::removeChild(RenderObject& oldChild)
</span><span class="cx"> {
</span><del>- if (!documentBeingDestroyed()) {
</del><ins>+ if (!renderTreeBeingDestroyed()) {
</ins><span class="cx"> RenderFlowThread* flowThread = multiColumnFlowThread();
</span><span class="cx"> if (flowThread && flowThread != &oldChild)
</span><span class="cx"> flowThread->flowThreadRelativeWillBeRemoved(oldChild);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isFloatingOrOutOfFlowPositioned());
</span><span class="cx">
</span><del>- if (documentBeingDestroyed())
</del><ins>+ if (renderTreeBeingDestroyed())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (isFloating()) {
</span><span class="lines">@@ -2194,7 +2194,7 @@
</span><span class="cx"> if (!m_inlineBoxWrapper)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!documentBeingDestroyed())
</del><ins>+ if (!renderTreeBeingDestroyed())
</ins><span class="cx"> m_inlineBoxWrapper->removeFromParent();
</span><span class="cx"> delete m_inlineBoxWrapper;
</span><span class="cx"> m_inlineBoxWrapper = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> if (firstLetterRemainingText())
</span><span class="cx"> setFirstLetterRemainingText(nullptr);
</span><span class="cx">
</span><del>- if (!documentBeingDestroyed())
</del><ins>+ if (!renderTreeBeingDestroyed())
</ins><span class="cx"> view().imageQualityController().rendererWillBeDestroyed(*this);
</span><span class="cx">
</span><span class="cx"> RenderLayerModelObject::willBeDestroyed();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -565,7 +565,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> newChild->initializeFlowThreadStateOnInsertion();
</span><del>- if (!documentBeingDestroyed()) {
</del><ins>+ if (!renderTreeBeingDestroyed()) {
</ins><span class="cx"> if (notifyChildren == NotifyChildren)
</span><span class="cx"> newChild->insertedIntoTree();
</span><span class="cx"> if (is<RenderElement>(*newChild))
</span><span class="lines">@@ -596,7 +596,7 @@
</span><span class="cx"> // So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or
</span><span class="cx"> // that a positioned child got yanked). We also repaint, so that the area exposed when the child
</span><span class="cx"> // disappears gets repainted properly.
</span><del>- if (!documentBeingDestroyed() && notifyChildren == NotifyChildren && oldChild.everHadLayout()) {
</del><ins>+ if (!renderTreeBeingDestroyed() && notifyChildren == NotifyChildren && oldChild.everHadLayout()) {
</ins><span class="cx"> oldChild.setNeedsLayoutAndPrefWidthsRecalc();
</span><span class="cx"> // We only repaint |oldChild| if we have a RenderLayer as its visual overflow may not be tracked by its parent.
</span><span class="cx"> if (oldChild.isBody())
</span><span class="lines">@@ -611,15 +611,15 @@
</span><span class="cx"> else if (is<RenderLineBreak>(oldChild))
</span><span class="cx"> downcast<RenderLineBreak>(oldChild).deleteInlineBoxWrapper();
</span><span class="cx">
</span><del>- if (!documentBeingDestroyed() && is<RenderFlexibleBox>(this) && !oldChild.isFloatingOrOutOfFlowPositioned() && oldChild.isBox())
</del><ins>+ if (!renderTreeBeingDestroyed() && is<RenderFlexibleBox>(this) && !oldChild.isFloatingOrOutOfFlowPositioned() && oldChild.isBox())
</ins><span class="cx"> downcast<RenderFlexibleBox>(this)->clearCachedChildIntrinsicContentLogicalHeight(downcast<RenderBox>(oldChild));
</span><span class="cx">
</span><span class="cx"> // If oldChild is the start or end of the selection, then clear the selection to
</span><span class="cx"> // avoid problems of invalid pointers.
</span><del>- if (!documentBeingDestroyed() && oldChild.isSelectionBorder())
</del><ins>+ if (!renderTreeBeingDestroyed() && oldChild.isSelectionBorder())
</ins><span class="cx"> frame().selection().setNeedsSelectionUpdate();
</span><span class="cx">
</span><del>- if (!documentBeingDestroyed() && notifyChildren == NotifyChildren)
</del><ins>+ if (!renderTreeBeingDestroyed() && notifyChildren == NotifyChildren)
</ins><span class="cx"> oldChild.willBeRemovedFromTree();
</span><span class="cx">
</span><span class="cx"> oldChild.resetFlowThreadStateOnRemoval();
</span><span class="lines">@@ -646,7 +646,7 @@
</span><span class="cx">
</span><span class="cx"> // rendererRemovedFromTree walks the whole subtree. We can improve performance
</span><span class="cx"> // by skipping this step when destroying the entire tree.
</span><del>- if (!documentBeingDestroyed() && is<RenderElement>(oldChild))
</del><ins>+ if (!renderTreeBeingDestroyed() && is<RenderElement>(oldChild))
</ins><span class="cx"> RenderCounter::rendererRemovedFromTree(downcast<RenderElement>(oldChild));
</span><span class="cx">
</span><span class="cx"> if (AXObjectCache* cache = document().existingAXObjectCache())
</span><span class="lines">@@ -1102,7 +1102,7 @@
</span><span class="cx">
</span><span class="cx"> inline void RenderElement::clearLayoutRootIfNeeded() const
</span><span class="cx"> {
</span><del>- if (documentBeingDestroyed())
</del><ins>+ if (renderTreeBeingDestroyed())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (view().frameView().layoutRoot() != this)
</span><span class="lines">@@ -1136,7 +1136,7 @@
</span><span class="cx"> RenderObject::willBeDestroyed();
</span><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span><del>- if (!documentBeingDestroyed() && view().hasRenderNamedFlowThreads()) {
</del><ins>+ if (!renderTreeBeingDestroyed() && view().hasRenderNamedFlowThreads()) {
</ins><span class="cx"> // After remove, the object and the associated information should not be in any flow thread.
</span><span class="cx"> for (auto& flowThread : *view().flowThreadController().renderNamedFlowThreadList()) {
</span><span class="cx"> ASSERT(!flowThread->hasChildInfo(this));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderImage::imageChanged(WrappedImagePtr newImage, const IntRect* rect)
</span><span class="cx"> {
</span><del>- if (documentBeingDestroyed())
</del><ins>+ if (renderTreeBeingDestroyed())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (hasVisibleBoxDecorations() || hasMask() || hasShapeOutside())
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderImage::notifyFinished(CachedResource& newImage)
</span><span class="cx"> {
</span><del>- if (documentBeingDestroyed())
</del><ins>+ if (renderTreeBeingDestroyed())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> invalidateBackgroundObscurationStatus();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -84,7 +84,7 @@
</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()) {
</del><ins>+ if (!renderTreeBeingDestroyed()) {
</ins><span class="cx"> if (firstLineBox()) {
</span><span class="cx"> // We can't wait for RenderBoxModelObject::destroy to clear the selection,
</span><span class="cx"> // because by then we will have nuked the line boxes.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -1904,7 +1904,7 @@
</span><span class="cx">
</span><span class="cx"> RenderLayer* RenderLayer::removeChild(RenderLayer* oldChild)
</span><span class="cx"> {
</span><del>- if (!renderer().documentBeingDestroyed())
</del><ins>+ if (!renderer().renderTreeBeingDestroyed())
</ins><span class="cx"> compositor().layerWillBeRemoved(*this, *oldChild);
</span><span class="cx">
</span><span class="cx"> // remove the child
</span><span class="lines">@@ -6131,7 +6131,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayer::clearBacking(bool layerBeingDestroyed)
</span><span class="cx"> {
</span><del>- if (m_backing && !renderer().documentBeingDestroyed())
</del><ins>+ if (m_backing && !renderer().renderTreeBeingDestroyed())
</ins><span class="cx"> compositor().layerBecameNonComposited(*this);
</span><span class="cx"> m_backing = nullptr;
</span><span class="cx">
</span><span class="lines">@@ -6272,12 +6272,12 @@
</span><span class="cx"> if (parent == m_parent)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_parent && !renderer().documentBeingDestroyed())
</del><ins>+ if (m_parent && !renderer().renderTreeBeingDestroyed())
</ins><span class="cx"> compositor().layerWillBeRemoved(*m_parent, *this);
</span><span class="cx">
</span><span class="cx"> m_parent = parent;
</span><span class="cx">
</span><del>- if (m_parent && !renderer().documentBeingDestroyed())
</del><ins>+ if (m_parent && !renderer().renderTreeBeingDestroyed())
</ins><span class="cx"> compositor().layerWasAdded(*m_parent, *this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6292,7 +6292,7 @@
</span><span class="cx"> m_negZOrderList->clear();
</span><span class="cx"> m_zOrderListsDirty = true;
</span><span class="cx">
</span><del>- if (!renderer().documentBeingDestroyed()) {
</del><ins>+ if (!renderer().renderTreeBeingDestroyed()) {
</ins><span class="cx"> if (isFlowThreadCollectingGraphicsLayersUnderRegions())
</span><span class="cx"> downcast<RenderFlowThread>(renderer()).setNeedsLayerToRegionMappingsUpdate();
</span><span class="cx"> compositor().setCompositingLayersNeedRebuild();
</span><span class="lines">@@ -6316,7 +6316,7 @@
</span><span class="cx"> m_normalFlowList->clear();
</span><span class="cx"> m_normalFlowListDirty = true;
</span><span class="cx">
</span><del>- if (!renderer().documentBeingDestroyed()) {
</del><ins>+ if (!renderer().renderTreeBeingDestroyed()) {
</ins><span class="cx"> if (isFlowThreadCollectingGraphicsLayersUnderRegions())
</span><span class="cx"> downcast<RenderFlowThread>(renderer()).setNeedsLayerToRegionMappingsUpdate();
</span><span class="cx"> compositor().setCompositingLayersNeedRebuild();
</span><span class="lines">@@ -6797,7 +6797,7 @@
</span><span class="cx"> bool wasOutOfFlowPositioned = oldStyle && (oldStyle->position() == AbsolutePosition || oldStyle->position() == FixedPosition);
</span><span class="cx"> if (parent() && (renderer().isOutOfFlowPositioned() != wasOutOfFlowPositioned)) {
</span><span class="cx"> parent()->dirtyAncestorChainHasOutOfFlowPositionedDescendantStatus();
</span><del>- if (!renderer().documentBeingDestroyed() && acceleratedCompositingForOverflowScrollEnabled())
</del><ins>+ if (!renderer().renderTreeBeingDestroyed() && acceleratedCompositingForOverflowScrollEnabled())
</ins><span class="cx"> compositor().setShouldReevaluateCompositingAfterLayout();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -6958,7 +6958,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayer::removeReflection()
</span><span class="cx"> {
</span><del>- if (!m_reflection->documentBeingDestroyed())
</del><ins>+ if (!m_reflection->renderTreeBeingDestroyed())
</ins><span class="cx"> m_reflection->removeLayers(this);
</span><span class="cx">
</span><span class="cx"> m_reflection->setParent(nullptr);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -2868,7 +2868,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayerBacking::notifyFlushRequired(const GraphicsLayer* layer)
</span><span class="cx"> {
</span><del>- if (renderer().documentBeingDestroyed())
</del><ins>+ if (renderer().renderTreeBeingDestroyed())
</ins><span class="cx"> return;
</span><span class="cx"> compositor().scheduleLayerFlush(layer->canThrottleLayerFlush());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -1123,7 +1123,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::layerWillBeRemoved(RenderLayer& parent, RenderLayer& child)
</span><span class="cx"> {
</span><del>- if (!child.isComposited() || parent.renderer().documentBeingDestroyed())
</del><ins>+ if (!child.isComposited() || parent.renderer().renderTreeBeingDestroyed())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> removeFromScrollCoordinatedLayers(child);
</span><span class="lines">@@ -1776,7 +1776,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::fixedRootBackgroundLayerChanged()
</span><span class="cx"> {
</span><del>- if (m_renderView.documentBeingDestroyed())
</del><ins>+ if (m_renderView.renderTreeBeingDestroyed())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_renderView.layer()->isComposited())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLineBreakcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLineBreak.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLineBreak.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderLineBreak.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_inlineBoxWrapper)
</span><span class="cx"> return;
</span><del>- if (!documentBeingDestroyed())
</del><ins>+ if (!renderTreeBeingDestroyed())
</ins><span class="cx"> m_inlineBoxWrapper->removeFromParent();
</span><span class="cx"> delete m_inlineBoxWrapper;
</span><span class="cx"> m_inlineBoxWrapper = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -499,7 +499,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderRegion::attachRegion();
</span><span class="cx">
</span><del>- if (documentBeingDestroyed() || !isValid())
</del><ins>+ if (renderTreeBeingDestroyed() || !isValid())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> updateRegionFlags();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> if (flowThreadState() == NotInsideFlowThread)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!documentBeingDestroyed() && is<RenderElement>(*this)) {
</del><ins>+ if (!renderTreeBeingDestroyed() && is<RenderElement>(*this)) {
</ins><span class="cx"> downcast<RenderElement>(*this).removeFromRenderFlowThread();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1473,7 +1473,7 @@
</span><span class="cx">
</span><span class="cx"> removeFromParent();
</span><span class="cx">
</span><del>- ASSERT(documentBeingDestroyed() || !is<RenderElement>(*this) || !view().frameView().hasSlowRepaintObject(downcast<RenderElement>(*this)));
</del><ins>+ ASSERT(renderTreeBeingDestroyed() || !is<RenderElement>(*this) || !view().frameView().hasSlowRepaintObject(downcast<RenderElement>(*this)));
</ins><span class="cx">
</span><span class="cx"> // The remove() call above may invoke axObjectCache()->childrenChanged() on the parent, which may require the AX render
</span><span class="cx"> // object for this renderer. So we remove the AX render object now, after the renderer is removed.
</span><span class="lines">@@ -1511,7 +1511,7 @@
</span><span class="cx"> void RenderObject::destroyAndCleanupAnonymousWrappers()
</span><span class="cx"> {
</span><span class="cx"> // If the tree is destroyed, there is no need for a clean-up phase.
</span><del>- if (documentBeingDestroyed()) {
</del><ins>+ if (renderTreeBeingDestroyed()) {
</ins><span class="cx"> destroy();
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderObject.h        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -739,9 +739,8 @@
</span><span class="cx"> */
</span><span class="cx"> virtual LayoutRect localCaretRect(InlineBox*, unsigned caretOffset, LayoutUnit* extraWidthToEndOfLine = nullptr);
</span><span class="cx">
</span><del>- // When performing a global document tear-down, the renderer of the document is cleared. We use this
- // as a hook to detect the case of document destruction and don't waste time doing unnecessary work.
- bool documentBeingDestroyed() const;
</del><ins>+ // When performing a global document tear-down, or when going into the page cache, the renderer of the document is cleared.
+ bool renderTreeBeingDestroyed() const;
</ins><span class="cx">
</span><span class="cx"> void destroyAndCleanupAnonymousWrappers();
</span><span class="cx"> void destroy();
</span><span class="lines">@@ -1027,7 +1026,7 @@
</span><span class="cx"> return frame().animation();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool RenderObject::documentBeingDestroyed() const
</del><ins>+inline bool RenderObject::renderTreeBeingDestroyed() const
</ins><span class="cx"> {
</span><span class="cx"> return document().renderTreeBeingDestroyed();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderQuotecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderQuote.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderQuote.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderQuote.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -446,7 +446,7 @@
</span><span class="cx"> view().setRenderQuoteHead(m_next);
</span><span class="cx"> if (m_next)
</span><span class="cx"> m_next->m_previous = m_previous;
</span><del>- if (!documentBeingDestroyed()) {
</del><ins>+ if (!renderTreeBeingDestroyed()) {
</ins><span class="cx"> for (RenderQuote* quote = m_next; quote; quote = quote->m_next)
</span><span class="cx"> quote->updateDepth();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRegioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRegion.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRegion.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderRegion.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderRegion::attachRegion()
</span><span class="cx"> {
</span><del>- if (documentBeingDestroyed())
</del><ins>+ if (renderTreeBeingDestroyed())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // A region starts off invalid.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderReplacedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderReplaced.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderReplaced::willBeDestroyed()
</span><span class="cx"> {
</span><del>- if (!documentBeingDestroyed() && parent())
</del><ins>+ if (!renderTreeBeingDestroyed() && parent())
</ins><span class="cx"> parent()->dirtyLinesFromChangedChild(*this);
</span><span class="cx">
</span><span class="cx"> RenderBox::willBeDestroyed();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRubyRuncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRubyRun.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRubyRun.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderRubyRun.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> {
</span><span class="cx"> // If the child is a ruby text, then merge the ruby base with the base of
</span><span class="cx"> // the right sibling run, if possible.
</span><del>- if (!beingDestroyed() && !documentBeingDestroyed() && child.isRubyText()) {
</del><ins>+ if (!beingDestroyed() && !renderTreeBeingDestroyed() && child.isRubyText()) {
</ins><span class="cx"> RenderRubyBase* base = rubyBase();
</span><span class="cx"> RenderObject* rightNeighbour = nextSibling();
</span><span class="cx"> if (base && is<RenderRubyRun>(rightNeighbour)) {
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx">
</span><span class="cx"> RenderBlockFlow::removeChild(child);
</span><span class="cx">
</span><del>- if (!beingDestroyed() && !documentBeingDestroyed()) {
</del><ins>+ if (!beingDestroyed() && !renderTreeBeingDestroyed()) {
</ins><span class="cx"> // Check if our base (if any) is now empty. If so, destroy it.
</span><span class="cx"> RenderBlock* base = rubyBase();
</span><span class="cx"> if (base && !base->firstChild()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.h (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.h        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderTable.h        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> bool needsSectionRecalc() const { return m_needsSectionRecalc; }
</span><span class="cx"> void setNeedsSectionRecalc()
</span><span class="cx"> {
</span><del>- if (documentBeingDestroyed())
</del><ins>+ if (renderTreeBeingDestroyed())
</ins><span class="cx"> return;
</span><span class="cx"> m_needsSectionRecalc = true;
</span><span class="cx"> setNeedsLayout();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderText.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderText::removeAndDestroyTextBoxes()
</span><span class="cx"> {
</span><del>- if (!documentBeingDestroyed())
</del><ins>+ if (!renderTreeBeingDestroyed())
</ins><span class="cx"> m_lineBoxes.removeAllFromParent(*this);
</span><span class="cx"> #if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderVideocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderVideo.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderVideo.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/RenderVideo.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderVideo::updatePlayer()
</span><span class="cx"> {
</span><del>- if (documentBeingDestroyed())
</del><ins>+ if (renderTreeBeingDestroyed())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> bool intrinsicSizeChanged;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(object.node());
</span><span class="cx">
</span><del>- if (needsLayout && !object.documentBeingDestroyed())
</del><ins>+ if (needsLayout && !object.renderTreeBeingDestroyed())
</ins><span class="cx"> object.setNeedsLayout();
</span><span class="cx">
</span><span class="cx"> if (is<RenderElement>(object))
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> client.setNeedsBoundariesUpdate();
</span><span class="cx"> break;
</span><span class="cx"> case RepaintInvalidation:
</span><del>- if (!client.documentBeingDestroyed())
</del><ins>+ if (!client.renderTreeBeingDestroyed())
</ins><span class="cx"> client.repaint();
</span><span class="cx"> break;
</span><span class="cx"> case ParentOnlyInvalidation:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp (214081 => 214082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp        2017-03-17 00:11:29 UTC (rev 214081)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp        2017-03-17 00:20:45 UTC (rev 214082)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> void RenderSVGText::subtreeChildWasAdded(RenderObject* child)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(child);
</span><del>- if (!shouldHandleSubtreeMutations() || documentBeingDestroyed())
</del><ins>+ if (!shouldHandleSubtreeMutations() || renderTreeBeingDestroyed())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // The positioning elements cache doesn't include the new 'child' yet. Clear the
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> bool stopAfterNext = false;
</span><span class="cx"> SVGTextLayoutAttributes* previous = nullptr;
</span><span class="cx"> SVGTextLayoutAttributes* next = nullptr;
</span><del>- if (!documentBeingDestroyed())
</del><ins>+ if (!renderTreeBeingDestroyed())
</ins><span class="cx"> findPreviousAndNextAttributes(*this, &text, stopAfterNext, previous, next);
</span><span class="cx">
</span><span class="cx"> if (previous)
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderSVGText::subtreeChildWasRemoved(const Vector<SVGTextLayoutAttributes*, 2>& affectedAttributes)
</span><span class="cx"> {
</span><del>- if (!shouldHandleSubtreeMutations() || documentBeingDestroyed()) {
</del><ins>+ if (!shouldHandleSubtreeMutations() || renderTreeBeingDestroyed()) {
</ins><span class="cx"> ASSERT(affectedAttributes.isEmpty());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> void RenderSVGText::subtreeStyleDidChange(RenderSVGInlineText* text)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(text);
</span><del>- if (!shouldHandleSubtreeMutations() || documentBeingDestroyed())
</del><ins>+ if (!shouldHandleSubtreeMutations() || renderTreeBeingDestroyed())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> checkLayoutAttributesConsistency(this, m_layoutAttributes);
</span></span></pre>
</div>
</div>
</body>
</html>