Changeset 214082 in webkit


Ignore:
Timestamp:
Mar 16, 2017 5:20:45 PM (7 years ago)
Author:
Simon Fraser
Message:

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):

Location:
trunk/Source/WebCore
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r214080 r214082  
     12017-03-16  Simon Fraser  <simon.fraser@apple.com>
     2
     3        RenderView::documentBeingDestroyed() needs a new name.
     4        https://bugs.webkit.org/show_bug.cgi?id=166727
     5
     6        Reviewed by Andreas Kling.
     7
     8        Now that we destroy the render tree for documents going into the page cache, RenderView::documentBeingDestroyed()
     9        is misleadingly named. Rename it to renderTreeBeingDestroyed() and fix all callers.
     10
     11        * page/FrameView.cpp:
     12        (WebCore::FrameView::scheduleRelayoutOfSubtree):
     13        * page/scrolling/ScrollingCoordinator.cpp:
     14        (WebCore::ScrollingCoordinator::absoluteEventTrackingRegionsForFrame):
     15        * rendering/CounterNode.cpp:
     16        (WebCore::CounterNode::resetRenderers):
     17        * rendering/ImageQualityController.cpp:
     18        (WebCore::ImageQualityController::highQualityRepaintTimerFired):
     19        * rendering/RenderBlock.cpp:
     20        (WebCore::RenderBlock::willBeDestroyed):
     21        (WebCore::canMergeContiguousAnonymousBlocks):
     22        (WebCore::RenderBlock::removeChild):
     23        * rendering/RenderBlockFlow.cpp:
     24        (WebCore::RenderBlockFlow::willBeDestroyed):
     25        (WebCore::RenderBlockFlow::removeChild):
     26        * rendering/RenderBox.cpp:
     27        (WebCore::RenderBox::removeFloatingOrPositionedChildFromBlockLists):
     28        (WebCore::RenderBox::deleteLineBoxWrapper):
     29        * rendering/RenderBoxModelObject.cpp:
     30        (WebCore::RenderBoxModelObject::willBeDestroyed):
     31        * rendering/RenderElement.cpp:
     32        (WebCore::RenderElement::insertChildInternal):
     33        (WebCore::RenderElement::removeChildInternal):
     34        (WebCore::RenderElement::clearLayoutRootIfNeeded):
     35        (WebCore::RenderElement::willBeDestroyed):
     36        * rendering/RenderImage.cpp:
     37        (WebCore::RenderImage::imageChanged):
     38        (WebCore::RenderImage::notifyFinished):
     39        * rendering/RenderInline.cpp:
     40        (WebCore::RenderInline::willBeDestroyed):
     41        * rendering/RenderLayer.cpp:
     42        (WebCore::RenderLayer::removeChild):
     43        (WebCore::RenderLayer::calculateClipRects):
     44        * rendering/RenderLayerBacking.cpp:
     45        (WebCore::RenderLayerBacking::notifyFlushRequired):
     46        * rendering/RenderLayerCompositor.cpp:
     47        (WebCore::RenderLayerCompositor::layerWillBeRemoved):
     48        (WebCore::RenderLayerCompositor::fixedRootBackgroundLayerChanged):
     49        * rendering/RenderLineBreak.cpp:
     50        (WebCore::RenderLineBreak::deleteInlineBoxWrapper):
     51        * rendering/RenderNamedFlowFragment.cpp:
     52        (WebCore::RenderNamedFlowFragment::attachRegion):
     53        * rendering/RenderObject.cpp:
     54        (WebCore::RenderObject::resetFlowThreadStateOnRemoval):
     55        (WebCore::RenderObject::willBeDestroyed):
     56        (WebCore::RenderObject::destroyAndCleanupAnonymousWrappers):
     57        * rendering/RenderObject.h:
     58        (WebCore::RenderObject::renderTreeBeingDestroyed):
     59        (WebCore::RenderObject::documentBeingDestroyed): Deleted.
     60        * rendering/RenderQuote.cpp:
     61        (WebCore::RenderQuote::detachQuote):
     62        * rendering/RenderRegion.cpp:
     63        (WebCore::RenderRegion::attachRegion):
     64        * rendering/RenderReplaced.cpp:
     65        (WebCore::RenderReplaced::willBeDestroyed):
     66        * rendering/RenderRubyRun.cpp:
     67        (WebCore::RenderRubyRun::removeChild):
     68        * rendering/RenderTable.h:
     69        (WebCore::RenderTable::setNeedsSectionRecalc):
     70        * rendering/RenderText.cpp:
     71        (WebCore::RenderText::removeAndDestroyTextBoxes):
     72        * rendering/RenderVideo.cpp:
     73        (WebCore::RenderVideo::updatePlayer):
     74        * rendering/svg/RenderSVGResource.cpp:
     75        (WebCore::RenderSVGResource::markForLayoutAndParentResourceInvalidation):
     76        * rendering/svg/RenderSVGResourceContainer.cpp:
     77        (WebCore::RenderSVGResourceContainer::markClientForInvalidation):
     78        * rendering/svg/RenderSVGText.cpp:
     79        (WebCore::RenderSVGText::subtreeChildWasAdded):
     80        (WebCore::RenderSVGText::subtreeChildWillBeRemoved):
     81        (WebCore::RenderSVGText::subtreeChildWasRemoved):
     82        (WebCore::RenderSVGText::subtreeStyleDidChange):
     83
    1842017-03-16  Youenn Fablet  <youenn@apple.com>
    285

  • trunk/Source/WebCore/page/FrameView.cpp

    r213715 r214082  
    30253025
    30263026    // Try to catch unnecessary work during render tree teardown.
    3027     ASSERT(!renderView.documentBeingDestroyed());
     3027    ASSERT(!renderView.renderTreeBeingDestroyed());
    30283028    ASSERT(frame().view() == this);
    30293029

  • trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

    r210758 r214082  
    101101{
    102102    auto* renderView = frame.contentRenderer();
    103     if (!renderView || renderView->documentBeingDestroyed())
     103    if (!renderView || renderView->renderTreeBeingDestroyed())
    104104        return EventTrackingRegions();
    105105

  • trunk/Source/WebCore/rendering/CounterNode.cpp

    r208744 r214082  
    178178    if (!m_rootRenderer)
    179179        return;
    180     bool skipLayoutAndPerfWidthsRecalc = m_rootRenderer->documentBeingDestroyed();
     180    bool skipLayoutAndPerfWidthsRecalc = m_rootRenderer->renderTreeBeingDestroyed();
    181181    auto* current = m_rootRenderer;
    182182    while (current) {

  • trunk/Source/WebCore/rendering/ImageQualityController.cpp

    r210758 r214082  
    7575void ImageQualityController::highQualityRepaintTimerFired()
    7676{
    77     if (m_renderView.documentBeingDestroyed())
     77    if (m_renderView.renderTreeBeingDestroyed())
    7878        return;
    7979    if (!m_animatedResizeIsActive && !m_liveResizeOptimizationIsActive)

  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r213923 r214082  
    344344void RenderBlock::willBeDestroyed()
    345345{
    346     if (!documentBeingDestroyed()) {
     346    if (!renderTreeBeingDestroyed()) {
    347347        if (parent())
    348348            parent()->dirtyLinesFromChangedChild(*this);
    … …  
    779779static bool canMergeContiguousAnonymousBlocks(RenderObject& oldChild, RenderObject* previous, RenderObject* next)
    780780{
    781     if (oldChild.documentBeingDestroyed() || oldChild.isInline() || oldChild.virtualContinuation())
     781    if (oldChild.renderTreeBeingDestroyed() || oldChild.isInline() || oldChild.virtualContinuation())
    782782        return false;
    783783
    … …  
    815815    // No need to waste time in merging or removing empty anonymous blocks.
    816816    // We can just bail out if our document is getting destroyed.
    817     if (documentBeingDestroyed()) {
     817    if (renderTreeBeingDestroyed()) {
    818818        RenderBox::removeChild(oldChild);
    819819        return;

  • trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

    r214023 r214082  
    154154    destroyLeftoverChildren();
    155155
    156     if (!documentBeingDestroyed()) {
     156    if (!renderTreeBeingDestroyed()) {
    157157        if (firstRootBox()) {
    158158            // We can't wait for RenderBox::destroy to clear the selection,
    … …  
    39273927void RenderBlockFlow::removeChild(RenderObject& oldChild)
    39283928{
    3929     if (!documentBeingDestroyed()) {
     3929    if (!renderTreeBeingDestroyed()) {
    39303930        RenderFlowThread* flowThread = multiColumnFlowThread();
    39313931        if (flowThread && flowThread != &oldChild)

  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r214010 r214082  
    280280    ASSERT(isFloatingOrOutOfFlowPositioned());
    281281
    282     if (documentBeingDestroyed())
     282    if (renderTreeBeingDestroyed())
    283283        return;
    284284
    … …  
    21952195        return;
    21962196   
    2197     if (!documentBeingDestroyed())
     2197    if (!renderTreeBeingDestroyed())
    21982198        m_inlineBoxWrapper->removeFromParent();
    21992199    delete m_inlineBoxWrapper;

  • trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

    r213455 r214082  
    192192        setFirstLetterRemainingText(nullptr);
    193193
    194     if (!documentBeingDestroyed())
     194    if (!renderTreeBeingDestroyed())
    195195        view().imageQualityController().rendererWillBeDestroyed(*this);
    196196

  • trunk/Source/WebCore/rendering/RenderElement.cpp

    r214023 r214082  
    566566
    567567    newChild->initializeFlowThreadStateOnInsertion();
    568     if (!documentBeingDestroyed()) {
     568    if (!renderTreeBeingDestroyed()) {
    569569        if (notifyChildren == NotifyChildren)
    570570            newChild->insertedIntoTree();
    … …  
    597597    // that a positioned child got yanked). We also repaint, so that the area exposed when the child
    598598    // disappears gets repainted properly.
    599     if (!documentBeingDestroyed() && notifyChildren == NotifyChildren && oldChild.everHadLayout()) {
     599    if (!renderTreeBeingDestroyed() && notifyChildren == NotifyChildren && oldChild.everHadLayout()) {
    600600        oldChild.setNeedsLayoutAndPrefWidthsRecalc();
    601601        // We only repaint |oldChild| if we have a RenderLayer as its visual overflow may not be tracked by its parent.
    … …  
    612612        downcast<RenderLineBreak>(oldChild).deleteInlineBoxWrapper();
    613613   
    614     if (!documentBeingDestroyed() && is<RenderFlexibleBox>(this) && !oldChild.isFloatingOrOutOfFlowPositioned() && oldChild.isBox())
     614    if (!renderTreeBeingDestroyed() && is<RenderFlexibleBox>(this) && !oldChild.isFloatingOrOutOfFlowPositioned() && oldChild.isBox())
    615615        downcast<RenderFlexibleBox>(this)->clearCachedChildIntrinsicContentLogicalHeight(downcast<RenderBox>(oldChild));
    616616
    617617    // If oldChild is the start or end of the selection, then clear the selection to
    618618    // avoid problems of invalid pointers.
    619     if (!documentBeingDestroyed() && oldChild.isSelectionBorder())
     619    if (!renderTreeBeingDestroyed() && oldChild.isSelectionBorder())
    620620        frame().selection().setNeedsSelectionUpdate();
    621621
    622     if (!documentBeingDestroyed() && notifyChildren == NotifyChildren)
     622    if (!renderTreeBeingDestroyed() && notifyChildren == NotifyChildren)
    623623        oldChild.willBeRemovedFromTree();
    624624
    … …  
    647647    // rendererRemovedFromTree walks the whole subtree. We can improve performance
    648648    // by skipping this step when destroying the entire tree.
    649     if (!documentBeingDestroyed() && is<RenderElement>(oldChild))
     649    if (!renderTreeBeingDestroyed() && is<RenderElement>(oldChild))
    650650        RenderCounter::rendererRemovedFromTree(downcast<RenderElement>(oldChild));
    651651
    … …  
    11031103inline void RenderElement::clearLayoutRootIfNeeded() const
    11041104{
    1105     if (documentBeingDestroyed())
     1105    if (renderTreeBeingDestroyed())
    11061106        return;
    11071107
    … …  
    11371137
    11381138#if !ASSERT_DISABLED
    1139     if (!documentBeingDestroyed() && view().hasRenderNamedFlowThreads()) {
     1139    if (!renderTreeBeingDestroyed() && view().hasRenderNamedFlowThreads()) {
    11401140        // After remove, the object and the associated information should not be in any flow thread.
    11411141        for (auto& flowThread : *view().flowThreadController().renderNamedFlowThreadList()) {

  • trunk/Source/WebCore/rendering/RenderImage.cpp

    r213466 r214082  
    231231void RenderImage::imageChanged(WrappedImagePtr newImage, const IntRect* rect)
    232232{
    233     if (documentBeingDestroyed())
     233    if (renderTreeBeingDestroyed())
    234234        return;
    235235
    … …  
    338338void RenderImage::notifyFinished(CachedResource& newImage)
    339339{
    340     if (documentBeingDestroyed())
     340    if (renderTreeBeingDestroyed())
    341341        return;
    342342

  • trunk/Source/WebCore/rendering/RenderInline.cpp

    r214059 r214082  
    8585    destroyLeftoverChildren();
    8686   
    87     if (!documentBeingDestroyed()) {
     87    if (!renderTreeBeingDestroyed()) {
    8888        if (firstLineBox()) {
    8989            // We can't wait for RenderBoxModelObject::destroy to clear the selection,

  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r213712 r214082  
    19051905RenderLayer* RenderLayer::removeChild(RenderLayer* oldChild)
    19061906{
    1907     if (!renderer().documentBeingDestroyed())
     1907    if (!renderer().renderTreeBeingDestroyed())
    19081908        compositor().layerWillBeRemoved(*this, *oldChild);
    19091909
    … …  
    61326132void RenderLayer::clearBacking(bool layerBeingDestroyed)
    61336133{
    6134     if (m_backing && !renderer().documentBeingDestroyed())
     6134    if (m_backing && !renderer().renderTreeBeingDestroyed())
    61356135        compositor().layerBecameNonComposited(*this);
    61366136    m_backing = nullptr;
    … …  
    62736273        return;
    62746274
    6275     if (m_parent && !renderer().documentBeingDestroyed())
     6275    if (m_parent && !renderer().renderTreeBeingDestroyed())
    62766276        compositor().layerWillBeRemoved(*m_parent, *this);
    62776277   
    62786278    m_parent = parent;
    62796279
    6280     if (m_parent && !renderer().documentBeingDestroyed())
     6280    if (m_parent && !renderer().renderTreeBeingDestroyed())
    62816281        compositor().layerWasAdded(*m_parent, *this);
    62826282}
    … …  
    62936293    m_zOrderListsDirty = true;
    62946294
    6295     if (!renderer().documentBeingDestroyed()) {
     6295    if (!renderer().renderTreeBeingDestroyed()) {
    62966296        if (isFlowThreadCollectingGraphicsLayersUnderRegions())
    62976297            downcast<RenderFlowThread>(renderer()).setNeedsLayerToRegionMappingsUpdate();
    … …  
    63176317    m_normalFlowListDirty = true;
    63186318
    6319     if (!renderer().documentBeingDestroyed()) {
     6319    if (!renderer().renderTreeBeingDestroyed()) {
    63206320        if (isFlowThreadCollectingGraphicsLayersUnderRegions())
    63216321            downcast<RenderFlowThread>(renderer()).setNeedsLayerToRegionMappingsUpdate();
    … …  
    67986798    if (parent() && (renderer().isOutOfFlowPositioned() != wasOutOfFlowPositioned)) {
    67996799        parent()->dirtyAncestorChainHasOutOfFlowPositionedDescendantStatus();
    6800         if (!renderer().documentBeingDestroyed() && acceleratedCompositingForOverflowScrollEnabled())
     6800        if (!renderer().renderTreeBeingDestroyed() && acceleratedCompositingForOverflowScrollEnabled())
    68016801            compositor().setShouldReevaluateCompositingAfterLayout();
    68026802    }
    … …  
    69596959void RenderLayer::removeReflection()
    69606960{
    6961     if (!m_reflection->documentBeingDestroyed())
     6961    if (!m_reflection->renderTreeBeingDestroyed())
    69626962        m_reflection->removeLayers(this);
    69636963

  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r214017 r214082  
    28692869void RenderLayerBacking::notifyFlushRequired(const GraphicsLayer* layer)
    28702870{
    2871     if (renderer().documentBeingDestroyed())
     2871    if (renderer().renderTreeBeingDestroyed())
    28722872        return;
    28732873    compositor().scheduleLayerFlush(layer->canThrottleLayerFlush());

  • trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r213466 r214082  
    11241124void RenderLayerCompositor::layerWillBeRemoved(RenderLayer& parent, RenderLayer& child)
    11251125{
    1126     if (!child.isComposited() || parent.renderer().documentBeingDestroyed())
     1126    if (!child.isComposited() || parent.renderer().renderTreeBeingDestroyed())
    11271127        return;
    11281128
    … …  
    17771777void RenderLayerCompositor::fixedRootBackgroundLayerChanged()
    17781778{
    1779     if (m_renderView.documentBeingDestroyed())
     1779    if (m_renderView.renderTreeBeingDestroyed())
    17801780        return;
    17811781

  • trunk/Source/WebCore/rendering/RenderLineBreak.cpp

    r207757 r214082  
    112112    if (!m_inlineBoxWrapper)
    113113        return;
    114     if (!documentBeingDestroyed())
     114    if (!renderTreeBeingDestroyed())
    115115        m_inlineBoxWrapper->removeFromParent();
    116116    delete m_inlineBoxWrapper;

  • trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp

    r208743 r214082  
    500500    RenderRegion::attachRegion();
    501501
    502     if (documentBeingDestroyed() || !isValid())
     502    if (renderTreeBeingDestroyed() || !isValid())
    503503        return;
    504504

  • trunk/Source/WebCore/rendering/RenderObject.cpp

    r213715 r214082  
    227227        return;
    228228
    229     if (!documentBeingDestroyed() && is<RenderElement>(*this)) {
     229    if (!renderTreeBeingDestroyed() && is<RenderElement>(*this)) {
    230230        downcast<RenderElement>(*this).removeFromRenderFlowThread();
    231231        return;
    … …  
    14741474    removeFromParent();
    14751475
    1476     ASSERT(documentBeingDestroyed() || !is<RenderElement>(*this) || !view().frameView().hasSlowRepaintObject(downcast<RenderElement>(*this)));
     1476    ASSERT(renderTreeBeingDestroyed() || !is<RenderElement>(*this) || !view().frameView().hasSlowRepaintObject(downcast<RenderElement>(*this)));
    14771477
    14781478    // The remove() call above may invoke axObjectCache()->childrenChanged() on the parent, which may require the AX render
    … …  
    15121512{
    15131513    // If the tree is destroyed, there is no need for a clean-up phase.
    1514     if (documentBeingDestroyed()) {
     1514    if (renderTreeBeingDestroyed()) {
    15151515        destroy();
    15161516        return;

  • trunk/Source/WebCore/rendering/RenderObject.h

    r213715 r214082  
    740740    virtual LayoutRect localCaretRect(InlineBox*, unsigned caretOffset, LayoutUnit* extraWidthToEndOfLine = nullptr);
    741741
    742     // When performing a global document tear-down, the renderer of the document is cleared.  We use this
    743     // as a hook to detect the case of document destruction and don't waste time doing unnecessary work.
    744     bool documentBeingDestroyed() const;
     742    // When performing a global document tear-down, or when going into the page cache, the renderer of the document is cleared.
     743    bool renderTreeBeingDestroyed() const;
    745744
    746745    void destroyAndCleanupAnonymousWrappers();
    … …  
    10281027}
    10291028
    1030 inline bool RenderObject::documentBeingDestroyed() const
     1029inline bool RenderObject::renderTreeBeingDestroyed() const
    10311030{
    10321031    return document().renderTreeBeingDestroyed();

  • trunk/Source/WebCore/rendering/RenderQuote.cpp

    r208731 r214082  
    447447    if (m_next)
    448448        m_next->m_previous = m_previous;
    449     if (!documentBeingDestroyed()) {
     449    if (!renderTreeBeingDestroyed()) {
    450450        for (RenderQuote* quote = m_next; quote; quote = quote->m_next)
    451451            quote->updateDepth();

  • trunk/Source/WebCore/rendering/RenderRegion.cpp

    r210828 r214082  
    280280void RenderRegion::attachRegion()
    281281{
    282     if (documentBeingDestroyed())
     282    if (renderTreeBeingDestroyed())
    283283        return;
    284284   

  • trunk/Source/WebCore/rendering/RenderReplaced.cpp

    r214010 r214082  
    7373void RenderReplaced::willBeDestroyed()
    7474{
    75     if (!documentBeingDestroyed() && parent())
     75    if (!renderTreeBeingDestroyed() && parent())
    7676        parent()->dirtyLinesFromChangedChild(*this);
    7777

  • trunk/Source/WebCore/rendering/RenderRubyRun.cpp

    r213455 r214082  
    159159    // If the child is a ruby text, then merge the ruby base with the base of
    160160    // the right sibling run, if possible.
    161     if (!beingDestroyed() && !documentBeingDestroyed() && child.isRubyText()) {
     161    if (!beingDestroyed() && !renderTreeBeingDestroyed() && child.isRubyText()) {
    162162        RenderRubyBase* base = rubyBase();
    163163        RenderObject* rightNeighbour = nextSibling();
    … …  
    179179    RenderBlockFlow::removeChild(child);
    180180
    181     if (!beingDestroyed() && !documentBeingDestroyed()) {
     181    if (!beingDestroyed() && !renderTreeBeingDestroyed()) {
    182182        // Check if our base (if any) is now empty. If so, destroy it.
    183183        RenderBlock* base = rubyBase();

  • trunk/Source/WebCore/rendering/RenderTable.h

    r213455 r214082  
    223223    void setNeedsSectionRecalc()
    224224    {
    225         if (documentBeingDestroyed())
     225        if (renderTreeBeingDestroyed())
    226226            return;
    227227        m_needsSectionRecalc = true;

  • trunk/Source/WebCore/rendering/RenderText.cpp

    r213095 r214082  
    273273void RenderText::removeAndDestroyTextBoxes()
    274274{
    275     if (!documentBeingDestroyed())
     275    if (!renderTreeBeingDestroyed())
    276276        m_lineBoxes.removeAllFromParent(*this);
    277277#if !ASSERT_WITH_SECURITY_IMPLICATION_DISABLED

  • trunk/Source/WebCore/rendering/RenderVideo.cpp

    r214010 r214082  
    217217void RenderVideo::updatePlayer()
    218218{
    219     if (documentBeingDestroyed())
     219    if (renderTreeBeingDestroyed())
    220220        return;
    221221

  • trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp

    r209777 r214082  
    192192    ASSERT(object.node());
    193193
    194     if (needsLayout && !object.documentBeingDestroyed())
     194    if (needsLayout && !object.renderTreeBeingDestroyed())
    195195        object.setNeedsLayout();
    196196

  • trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp

    r200041 r214082  
    134134        break;
    135135    case RepaintInvalidation:
    136         if (!client.documentBeingDestroyed())
     136        if (!client.renderTreeBeingDestroyed())
    137137            client.repaint();
    138138        break;

  • trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp

    r212562 r214082  
    162162{
    163163    ASSERT(child);
    164     if (!shouldHandleSubtreeMutations() || documentBeingDestroyed())
     164    if (!shouldHandleSubtreeMutations() || renderTreeBeingDestroyed())
    165165        return;
    166166
    … …  
    250250    SVGTextLayoutAttributes* previous = nullptr;
    251251    SVGTextLayoutAttributes* next = nullptr;
    252     if (!documentBeingDestroyed())
     252    if (!renderTreeBeingDestroyed())
    253253        findPreviousAndNextAttributes(*this, &text, stopAfterNext, previous, next);
    254254
    … …  
    264264void RenderSVGText::subtreeChildWasRemoved(const Vector<SVGTextLayoutAttributes*, 2>& affectedAttributes)
    265265{
    266     if (!shouldHandleSubtreeMutations() || documentBeingDestroyed()) {
     266    if (!shouldHandleSubtreeMutations() || renderTreeBeingDestroyed()) {
    267267        ASSERT(affectedAttributes.isEmpty());
    268268        return;
    … …  
    279279{
    280280    ASSERT(text);
    281     if (!shouldHandleSubtreeMutations() || documentBeingDestroyed())
     281    if (!shouldHandleSubtreeMutations() || renderTreeBeingDestroyed())
    282282        return;
    283283
Note: See TracChangeset for help on using the changeset viewer.