Diff
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-04-03 10:27:17 UTC (rev 214761)
@@ -1,3 +1,86 @@
+2017-03-16 Simon Fraser <simon.fra...@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):
+
2017-03-16 Zalan Bujtas <za...@apple.com>
Stay inside the continuation while searching for a candidate ancestor for insertion.
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/page/FrameView.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/page/FrameView.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/page/FrameView.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -3020,7 +3020,7 @@
const RenderView& renderView = *this->renderView();
// Try to catch unnecessary work during render tree teardown.
- ASSERT(!renderView.documentBeingDestroyed());
+ ASSERT(!renderView.renderTreeBeingDestroyed());
ASSERT(frame().view() == this);
// When m_layoutRoot is already set, ignore the renderView's needsLayout bit
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -100,7 +100,7 @@
EventTrackingRegions ScrollingCoordinator::absoluteEventTrackingRegionsForFrame(const Frame& frame) const
{
auto* renderView = frame.contentRenderer();
- if (!renderView || renderView->documentBeingDestroyed())
+ if (!renderView || renderView->renderTreeBeingDestroyed())
return EventTrackingRegions();
#if ENABLE(IOS_TOUCH_EVENTS)
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/CounterNode.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/CounterNode.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/CounterNode.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -177,7 +177,7 @@
{
if (!m_rootRenderer)
return;
- bool skipLayoutAndPerfWidthsRecalc = m_rootRenderer->documentBeingDestroyed();
+ bool skipLayoutAndPerfWidthsRecalc = m_rootRenderer->renderTreeBeingDestroyed();
auto* current = m_rootRenderer;
while (current) {
if (!skipLayoutAndPerfWidthsRecalc)
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/ImageQualityController.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/ImageQualityController.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/ImageQualityController.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -74,7 +74,7 @@
void ImageQualityController::highQualityRepaintTimerFired()
{
- if (m_renderView.documentBeingDestroyed())
+ if (m_renderView.renderTreeBeingDestroyed())
return;
if (!m_animatedResizeIsActive && !m_liveResizeOptimizationIsActive)
return;
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlock.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlock.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlock.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -345,7 +345,7 @@
void RenderBlock::willBeDestroyed()
{
- if (!documentBeingDestroyed()) {
+ if (!renderTreeBeingDestroyed()) {
if (parent())
parent()->dirtyLinesFromChangedChild(*this);
}
@@ -780,7 +780,7 @@
static bool canMergeContiguousAnonymousBlocks(RenderObject& oldChild, RenderObject* previous, RenderObject* next)
{
- if (oldChild.documentBeingDestroyed() || oldChild.isInline() || oldChild.virtualContinuation())
+ if (oldChild.renderTreeBeingDestroyed() || oldChild.isInline() || oldChild.virtualContinuation())
return false;
if (previous) {
@@ -816,7 +816,7 @@
{
// No need to waste time in merging or removing empty anonymous blocks.
// We can just bail out if our document is getting destroyed.
- if (documentBeingDestroyed()) {
+ if (renderTreeBeingDestroyed()) {
RenderBox::removeChild(oldChild);
return;
}
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlockFlow.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -153,7 +153,7 @@
// properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise.
destroyLeftoverChildren();
- if (!documentBeingDestroyed()) {
+ if (!renderTreeBeingDestroyed()) {
if (firstRootBox()) {
// We can't wait for RenderBox::destroy to clear the selection,
// because by then we will have nuked the line boxes.
@@ -3924,7 +3924,7 @@
void RenderBlockFlow::removeChild(RenderObject& oldChild)
{
- if (!documentBeingDestroyed()) {
+ if (!renderTreeBeingDestroyed()) {
RenderFlowThread* flowThread = multiColumnFlowThread();
if (flowThread && flowThread != &oldChild)
flowThread->flowThreadRelativeWillBeRemoved(oldChild);
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBox.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBox.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBox.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -278,7 +278,7 @@
{
ASSERT(isFloatingOrOutOfFlowPositioned());
- if (documentBeingDestroyed())
+ if (renderTreeBeingDestroyed())
return;
if (isFloating()) {
@@ -2191,7 +2191,7 @@
if (!m_inlineBoxWrapper)
return;
- if (!documentBeingDestroyed())
+ if (!renderTreeBeingDestroyed())
m_inlineBoxWrapper->removeFromParent();
delete m_inlineBoxWrapper;
m_inlineBoxWrapper = nullptr;
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBoxModelObject.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBoxModelObject.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBoxModelObject.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -190,7 +190,7 @@
if (firstLetterRemainingText())
setFirstLetterRemainingText(nullptr);
- if (!documentBeingDestroyed())
+ if (!renderTreeBeingDestroyed())
view().imageQualityController().rendererWillBeDestroyed(*this);
RenderLayerModelObject::willBeDestroyed();
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderElement.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderElement.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderElement.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -554,7 +554,7 @@
}
newChild->initializeFlowThreadStateOnInsertion();
- if (!documentBeingDestroyed()) {
+ if (!renderTreeBeingDestroyed()) {
if (notifyChildren == NotifyChildren)
newChild->insertedIntoTree();
if (is<RenderElement>(*newChild))
@@ -585,7 +585,7 @@
// So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or
// that a positioned child got yanked). We also repaint, so that the area exposed when the child
// disappears gets repainted properly.
- if (!documentBeingDestroyed() && notifyChildren == NotifyChildren && oldChild.everHadLayout()) {
+ if (!renderTreeBeingDestroyed() && notifyChildren == NotifyChildren && oldChild.everHadLayout()) {
oldChild.setNeedsLayoutAndPrefWidthsRecalc();
// We only repaint |oldChild| if we have a RenderLayer as its visual overflow may not be tracked by its parent.
if (oldChild.isBody())
@@ -602,10 +602,10 @@
// If oldChild is the start or end of the selection, then clear the selection to
// avoid problems of invalid pointers.
- if (!documentBeingDestroyed() && oldChild.isSelectionBorder())
+ if (!renderTreeBeingDestroyed() && oldChild.isSelectionBorder())
frame().selection().setNeedsSelectionUpdate();
- if (!documentBeingDestroyed() && notifyChildren == NotifyChildren)
+ if (!renderTreeBeingDestroyed() && notifyChildren == NotifyChildren)
oldChild.willBeRemovedFromTree();
oldChild.resetFlowThreadStateOnRemoval();
@@ -632,7 +632,7 @@
// rendererRemovedFromTree walks the whole subtree. We can improve performance
// by skipping this step when destroying the entire tree.
- if (!documentBeingDestroyed() && is<RenderElement>(oldChild))
+ if (!renderTreeBeingDestroyed() && is<RenderElement>(oldChild))
RenderCounter::rendererRemovedFromTree(downcast<RenderElement>(oldChild));
if (AXObjectCache* cache = document().existingAXObjectCache())
@@ -1086,7 +1086,7 @@
inline void RenderElement::clearLayoutRootIfNeeded() const
{
- if (documentBeingDestroyed())
+ if (renderTreeBeingDestroyed())
return;
if (view().frameView().layoutRoot() != this)
@@ -1120,7 +1120,7 @@
RenderObject::willBeDestroyed();
#if !ASSERT_DISABLED
- if (!documentBeingDestroyed() && view().hasRenderNamedFlowThreads()) {
+ if (!renderTreeBeingDestroyed() && view().hasRenderNamedFlowThreads()) {
// After remove, the object and the associated information should not be in any flow thread.
for (auto& flowThread : *view().flowThreadController().renderNamedFlowThreadList()) {
ASSERT(!flowThread->hasChildInfo(this));
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderImage.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderImage.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderImage.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -230,7 +230,7 @@
void RenderImage::imageChanged(WrappedImagePtr newImage, const IntRect* rect)
{
- if (documentBeingDestroyed())
+ if (renderTreeBeingDestroyed())
return;
if (hasVisibleBoxDecorations() || hasMask() || hasShapeOutside())
@@ -337,7 +337,7 @@
void RenderImage::notifyFinished(CachedResource& newImage)
{
- if (documentBeingDestroyed())
+ if (renderTreeBeingDestroyed())
return;
invalidateBackgroundObscurationStatus();
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderInline.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderInline.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderInline.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -84,7 +84,7 @@
// properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise.
destroyLeftoverChildren();
- if (!documentBeingDestroyed()) {
+ if (!renderTreeBeingDestroyed()) {
if (firstLineBox()) {
// We can't wait for RenderBoxModelObject::destroy to clear the selection,
// because by then we will have nuked the line boxes.
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayer.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayer.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayer.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -1902,7 +1902,7 @@
RenderLayer* RenderLayer::removeChild(RenderLayer* oldChild)
{
- if (!renderer().documentBeingDestroyed())
+ if (!renderer().renderTreeBeingDestroyed())
compositor().layerWillBeRemoved(*this, *oldChild);
// remove the child
@@ -6122,7 +6122,7 @@
void RenderLayer::clearBacking(bool layerBeingDestroyed)
{
- if (m_backing && !renderer().documentBeingDestroyed())
+ if (m_backing && !renderer().renderTreeBeingDestroyed())
compositor().layerBecameNonComposited(*this);
m_backing = nullptr;
@@ -6263,12 +6263,12 @@
if (parent == m_parent)
return;
- if (m_parent && !renderer().documentBeingDestroyed())
+ if (m_parent && !renderer().renderTreeBeingDestroyed())
compositor().layerWillBeRemoved(*m_parent, *this);
m_parent = parent;
- if (m_parent && !renderer().documentBeingDestroyed())
+ if (m_parent && !renderer().renderTreeBeingDestroyed())
compositor().layerWasAdded(*m_parent, *this);
}
@@ -6283,7 +6283,7 @@
m_negZOrderList->clear();
m_zOrderListsDirty = true;
- if (!renderer().documentBeingDestroyed()) {
+ if (!renderer().renderTreeBeingDestroyed()) {
if (isFlowThreadCollectingGraphicsLayersUnderRegions())
downcast<RenderFlowThread>(renderer()).setNeedsLayerToRegionMappingsUpdate();
compositor().setCompositingLayersNeedRebuild();
@@ -6307,7 +6307,7 @@
m_normalFlowList->clear();
m_normalFlowListDirty = true;
- if (!renderer().documentBeingDestroyed()) {
+ if (!renderer().renderTreeBeingDestroyed()) {
if (isFlowThreadCollectingGraphicsLayersUnderRegions())
downcast<RenderFlowThread>(renderer()).setNeedsLayerToRegionMappingsUpdate();
compositor().setCompositingLayersNeedRebuild();
@@ -6757,7 +6757,7 @@
bool wasOutOfFlowPositioned = oldStyle && (oldStyle->position() == AbsolutePosition || oldStyle->position() == FixedPosition);
if (parent() && (renderer().isOutOfFlowPositioned() != wasOutOfFlowPositioned)) {
parent()->dirtyAncestorChainHasOutOfFlowPositionedDescendantStatus();
- if (!renderer().documentBeingDestroyed() && acceleratedCompositingForOverflowScrollEnabled())
+ if (!renderer().renderTreeBeingDestroyed() && acceleratedCompositingForOverflowScrollEnabled())
compositor().setShouldReevaluateCompositingAfterLayout();
}
}
@@ -6918,7 +6918,7 @@
void RenderLayer::removeReflection()
{
- if (!m_reflection->documentBeingDestroyed())
+ if (!m_reflection->renderTreeBeingDestroyed())
m_reflection->removeLayers(this);
m_reflection->setParent(nullptr);
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -2727,7 +2727,7 @@
void RenderLayerBacking::notifyFlushRequired(const GraphicsLayer* layer)
{
- if (renderer().documentBeingDestroyed())
+ if (renderer().renderTreeBeingDestroyed())
return;
compositor().scheduleLayerFlush(layer->canThrottleLayerFlush());
}
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerCompositor.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -1117,7 +1117,7 @@
void RenderLayerCompositor::layerWillBeRemoved(RenderLayer& parent, RenderLayer& child)
{
- if (!child.isComposited() || parent.renderer().documentBeingDestroyed())
+ if (!child.isComposited() || parent.renderer().renderTreeBeingDestroyed())
return;
removeFromScrollCoordinatedLayers(child);
@@ -1770,7 +1770,7 @@
void RenderLayerCompositor::fixedRootBackgroundLayerChanged()
{
- if (m_renderView.documentBeingDestroyed())
+ if (m_renderView.renderTreeBeingDestroyed())
return;
if (m_renderView.layer()->isComposited())
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLineBreak.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLineBreak.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLineBreak.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -111,7 +111,7 @@
{
if (!m_inlineBoxWrapper)
return;
- if (!documentBeingDestroyed())
+ if (!renderTreeBeingDestroyed())
m_inlineBoxWrapper->removeFromParent();
delete m_inlineBoxWrapper;
m_inlineBoxWrapper = nullptr;
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderNamedFlowFragment.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -499,7 +499,7 @@
{
RenderRegion::attachRegion();
- if (documentBeingDestroyed() || !isValid())
+ if (renderTreeBeingDestroyed() || !isValid())
return;
updateRegionFlags();
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderObject.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderObject.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderObject.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -220,7 +220,7 @@
if (flowThreadState() == NotInsideFlowThread)
return;
- if (!documentBeingDestroyed() && is<RenderElement>(*this)) {
+ if (!renderTreeBeingDestroyed() && is<RenderElement>(*this)) {
downcast<RenderElement>(*this).removeFromRenderFlowThread();
return;
}
@@ -1467,7 +1467,7 @@
removeFromParent();
- ASSERT(documentBeingDestroyed() || !is<RenderElement>(*this) || !view().frameView().hasSlowRepaintObject(downcast<RenderElement>(*this)));
+ ASSERT(renderTreeBeingDestroyed() || !is<RenderElement>(*this) || !view().frameView().hasSlowRepaintObject(downcast<RenderElement>(*this)));
// The remove() call above may invoke axObjectCache()->childrenChanged() on the parent, which may require the AX render
// object for this renderer. So we remove the AX render object now, after the renderer is removed.
@@ -1505,7 +1505,7 @@
void RenderObject::destroyAndCleanupAnonymousWrappers()
{
// If the tree is destroyed, there is no need for a clean-up phase.
- if (documentBeingDestroyed()) {
+ if (renderTreeBeingDestroyed()) {
destroy();
return;
}
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderObject.h (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderObject.h 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderObject.h 2017-04-03 10:27:17 UTC (rev 214761)
@@ -735,9 +735,8 @@
*/
virtual LayoutRect localCaretRect(InlineBox*, unsigned caretOffset, LayoutUnit* extraWidthToEndOfLine = nullptr);
- // 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;
+ // When performing a global document tear-down, or when going into the page cache, the renderer of the document is cleared.
+ bool renderTreeBeingDestroyed() const;
void destroyAndCleanupAnonymousWrappers();
void destroy();
@@ -1020,7 +1019,7 @@
return frame().animation();
}
-inline bool RenderObject::documentBeingDestroyed() const
+inline bool RenderObject::renderTreeBeingDestroyed() const
{
return document().renderTreeBeingDestroyed();
}
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderQuote.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderQuote.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderQuote.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -446,7 +446,7 @@
view().setRenderQuoteHead(m_next);
if (m_next)
m_next->m_previous = m_previous;
- if (!documentBeingDestroyed()) {
+ if (!renderTreeBeingDestroyed()) {
for (RenderQuote* quote = m_next; quote; quote = quote->m_next)
quote->updateDepth();
}
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderRegion.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderRegion.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderRegion.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -279,7 +279,7 @@
void RenderRegion::attachRegion()
{
- if (documentBeingDestroyed())
+ if (renderTreeBeingDestroyed())
return;
// A region starts off invalid.
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderReplaced.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderReplaced.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderReplaced.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -72,7 +72,7 @@
void RenderReplaced::willBeDestroyed()
{
- if (!documentBeingDestroyed() && parent())
+ if (!renderTreeBeingDestroyed() && parent())
parent()->dirtyLinesFromChangedChild(*this);
RenderBox::willBeDestroyed();
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderRubyRun.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderRubyRun.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderRubyRun.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -158,7 +158,7 @@
{
// If the child is a ruby text, then merge the ruby base with the base of
// the right sibling run, if possible.
- if (!beingDestroyed() && !documentBeingDestroyed() && child.isRubyText()) {
+ if (!beingDestroyed() && !renderTreeBeingDestroyed() && child.isRubyText()) {
RenderRubyBase* base = rubyBase();
RenderObject* rightNeighbour = nextSibling();
if (base && is<RenderRubyRun>(rightNeighbour)) {
@@ -178,7 +178,7 @@
RenderBlockFlow::removeChild(child);
- if (!beingDestroyed() && !documentBeingDestroyed()) {
+ if (!beingDestroyed() && !renderTreeBeingDestroyed()) {
// Check if our base (if any) is now empty. If so, destroy it.
RenderBlock* base = rubyBase();
if (base && !base->firstChild()) {
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderTable.h (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderTable.h 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderTable.h 2017-04-03 10:27:17 UTC (rev 214761)
@@ -222,7 +222,7 @@
bool needsSectionRecalc() const { return m_needsSectionRecalc; }
void setNeedsSectionRecalc()
{
- if (documentBeingDestroyed())
+ if (renderTreeBeingDestroyed())
return;
m_needsSectionRecalc = true;
setNeedsLayout();
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderText.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderText.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderText.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -272,7 +272,7 @@
void RenderText::removeAndDestroyTextBoxes()
{
- if (!documentBeingDestroyed())
+ if (!renderTreeBeingDestroyed())
m_lineBoxes.removeAllFromParent(*this);
#if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED
else
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderVideo.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderVideo.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderVideo.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -216,7 +216,7 @@
void RenderVideo::updatePlayer()
{
- if (documentBeingDestroyed())
+ if (renderTreeBeingDestroyed())
return;
bool intrinsicSizeChanged;
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/svg/RenderSVGResource.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/svg/RenderSVGResource.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/svg/RenderSVGResource.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -191,7 +191,7 @@
{
ASSERT(object.node());
- if (needsLayout && !object.documentBeingDestroyed())
+ if (needsLayout && !object.renderTreeBeingDestroyed())
object.setNeedsLayout();
if (is<RenderElement>(object))
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -133,7 +133,7 @@
client.setNeedsBoundariesUpdate();
break;
case RepaintInvalidation:
- if (!client.documentBeingDestroyed())
+ if (!client.renderTreeBeingDestroyed())
client.repaint();
break;
case ParentOnlyInvalidation:
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/svg/RenderSVGText.cpp (214760 => 214761)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/svg/RenderSVGText.cpp 2017-04-03 10:12:38 UTC (rev 214760)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/svg/RenderSVGText.cpp 2017-04-03 10:27:17 UTC (rev 214761)
@@ -161,7 +161,7 @@
void RenderSVGText::subtreeChildWasAdded(RenderObject* child)
{
ASSERT(child);
- if (!shouldHandleSubtreeMutations() || documentBeingDestroyed())
+ if (!shouldHandleSubtreeMutations() || renderTreeBeingDestroyed())
return;
// The positioning elements cache doesn't include the new 'child' yet. Clear the
@@ -249,7 +249,7 @@
bool stopAfterNext = false;
SVGTextLayoutAttributes* previous = nullptr;
SVGTextLayoutAttributes* next = nullptr;
- if (!documentBeingDestroyed())
+ if (!renderTreeBeingDestroyed())
findPreviousAndNextAttributes(*this, &text, stopAfterNext, previous, next);
if (previous)
@@ -263,7 +263,7 @@
void RenderSVGText::subtreeChildWasRemoved(const Vector<SVGTextLayoutAttributes*, 2>& affectedAttributes)
{
- if (!shouldHandleSubtreeMutations() || documentBeingDestroyed()) {
+ if (!shouldHandleSubtreeMutations() || renderTreeBeingDestroyed()) {
ASSERT(affectedAttributes.isEmpty());
return;
}
@@ -278,7 +278,7 @@
void RenderSVGText::subtreeStyleDidChange(RenderSVGInlineText* text)
{
ASSERT(text);
- if (!shouldHandleSubtreeMutations() || documentBeingDestroyed())
+ if (!shouldHandleSubtreeMutations() || renderTreeBeingDestroyed())
return;
checkLayoutAttributesConsistency(this, m_layoutAttributes);
