Changeset 214761 in webkit


Ignore:
Timestamp:
Apr 3, 2017 3:27:17 AM (7 years ago)
Author:
Carlos Garcia Campos
Message:

Merge r214082 - 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:
releases/WebKitGTK/webkit-2.16/Source/WebCore
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog

    r214758 r214761  
     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  Zalan Bujtas  <zalan@apple.com>
    285

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/page/FrameView.cpp

    r212559 r214761  
    30213021
    30223022    // Try to catch unnecessary work during render tree teardown.
    3023     ASSERT(!renderView.documentBeingDestroyed());
     3023    ASSERT(!renderView.renderTreeBeingDestroyed());
    30243024    ASSERT(frame().view() == this);
    30253025

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

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

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/CounterNode.cpp

    r208744 r214761  
    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) {

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/ImageQualityController.cpp

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

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlock.cpp

    r214736 r214761  
    346346void RenderBlock::willBeDestroyed()
    347347{
    348     if (!documentBeingDestroyed()) {
     348    if (!renderTreeBeingDestroyed()) {
    349349        if (parent())
    350350            parent()->dirtyLinesFromChangedChild(*this);
    … …  
    781781static bool canMergeContiguousAnonymousBlocks(RenderObject& oldChild, RenderObject* previous, RenderObject* next)
    782782{
    783     if (oldChild.documentBeingDestroyed() || oldChild.isInline() || oldChild.virtualContinuation())
     783    if (oldChild.renderTreeBeingDestroyed() || oldChild.isInline() || oldChild.virtualContinuation())
    784784        return false;
    785785
    … …  
    817817    // No need to waste time in merging or removing empty anonymous blocks.
    818818    // We can just bail out if our document is getting destroyed.
    819     if (documentBeingDestroyed()) {
     819    if (renderTreeBeingDestroyed()) {
    820820        RenderBox::removeChild(oldChild);
    821821        return;

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBlockFlow.cpp

    r214751 r214761  
    154154    destroyLeftoverChildren();
    155155
    156     if (!documentBeingDestroyed()) {
     156    if (!renderTreeBeingDestroyed()) {
    157157        if (firstRootBox()) {
    158158            // We can't wait for RenderBox::destroy to clear the selection,
    … …  
    39253925void RenderBlockFlow::removeChild(RenderObject& oldChild)
    39263926{
    3927     if (!documentBeingDestroyed()) {
     3927    if (!renderTreeBeingDestroyed()) {
    39283928        RenderFlowThread* flowThread = multiColumnFlowThread();
    39293929        if (flowThread && flowThread != &oldChild)

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBox.cpp

    r214744 r214761  
    279279    ASSERT(isFloatingOrOutOfFlowPositioned());
    280280
    281     if (documentBeingDestroyed())
     281    if (renderTreeBeingDestroyed())
    282282        return;
    283283
    … …  
    21922192        return;
    21932193   
    2194     if (!documentBeingDestroyed())
     2194    if (!renderTreeBeingDestroyed())
    21952195        m_inlineBoxWrapper->removeFromParent();
    21962196    delete m_inlineBoxWrapper;

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderBoxModelObject.cpp

    r210768 r214761  
    191191        setFirstLetterRemainingText(nullptr);
    192192
    193     if (!documentBeingDestroyed())
     193    if (!renderTreeBeingDestroyed())
    194194        view().imageQualityController().rendererWillBeDestroyed(*this);
    195195

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderElement.cpp

    r214751 r214761  
    555555
    556556    newChild->initializeFlowThreadStateOnInsertion();
    557     if (!documentBeingDestroyed()) {
     557    if (!renderTreeBeingDestroyed()) {
    558558        if (notifyChildren == NotifyChildren)
    559559            newChild->insertedIntoTree();
    … …  
    586586    // that a positioned child got yanked). We also repaint, so that the area exposed when the child
    587587    // disappears gets repainted properly.
    588     if (!documentBeingDestroyed() && notifyChildren == NotifyChildren && oldChild.everHadLayout()) {
     588    if (!renderTreeBeingDestroyed() && notifyChildren == NotifyChildren && oldChild.everHadLayout()) {
    589589        oldChild.setNeedsLayoutAndPrefWidthsRecalc();
    590590        // We only repaint |oldChild| if we have a RenderLayer as its visual overflow may not be tracked by its parent.
    … …  
    603603    // If oldChild is the start or end of the selection, then clear the selection to
    604604    // avoid problems of invalid pointers.
    605     if (!documentBeingDestroyed() && oldChild.isSelectionBorder())
     605    if (!renderTreeBeingDestroyed() && oldChild.isSelectionBorder())
    606606        frame().selection().setNeedsSelectionUpdate();
    607607
    608     if (!documentBeingDestroyed() && notifyChildren == NotifyChildren)
     608    if (!renderTreeBeingDestroyed() && notifyChildren == NotifyChildren)
    609609        oldChild.willBeRemovedFromTree();
    610610
    … …  
    633633    // rendererRemovedFromTree walks the whole subtree. We can improve performance
    634634    // by skipping this step when destroying the entire tree.
    635     if (!documentBeingDestroyed() && is<RenderElement>(oldChild))
     635    if (!renderTreeBeingDestroyed() && is<RenderElement>(oldChild))
    636636        RenderCounter::rendererRemovedFromTree(downcast<RenderElement>(oldChild));
    637637
    … …  
    10871087inline void RenderElement::clearLayoutRootIfNeeded() const
    10881088{
    1089     if (documentBeingDestroyed())
     1089    if (renderTreeBeingDestroyed())
    10901090        return;
    10911091
    … …  
    11211121
    11221122#if !ASSERT_DISABLED
    1123     if (!documentBeingDestroyed() && view().hasRenderNamedFlowThreads()) {
     1123    if (!renderTreeBeingDestroyed() && view().hasRenderNamedFlowThreads()) {
    11241124        // After remove, the object and the associated information should not be in any flow thread.
    11251125        for (auto& flowThread : *view().flowThreadController().renderNamedFlowThreadList()) {

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderImage.cpp

    r213806 r214761  
    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

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderInline.cpp

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

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayer.cpp

    r213812 r214761  
    19031903RenderLayer* RenderLayer::removeChild(RenderLayer* oldChild)
    19041904{
    1905     if (!renderer().documentBeingDestroyed())
     1905    if (!renderer().renderTreeBeingDestroyed())
    19061906        compositor().layerWillBeRemoved(*this, *oldChild);
    19071907
    … …  
    61236123void RenderLayer::clearBacking(bool layerBeingDestroyed)
    61246124{
    6125     if (m_backing && !renderer().documentBeingDestroyed())
     6125    if (m_backing && !renderer().renderTreeBeingDestroyed())
    61266126        compositor().layerBecameNonComposited(*this);
    61276127    m_backing = nullptr;
    … …  
    62646264        return;
    62656265
    6266     if (m_parent && !renderer().documentBeingDestroyed())
     6266    if (m_parent && !renderer().renderTreeBeingDestroyed())
    62676267        compositor().layerWillBeRemoved(*m_parent, *this);
    62686268   
    62696269    m_parent = parent;
    62706270
    6271     if (m_parent && !renderer().documentBeingDestroyed())
     6271    if (m_parent && !renderer().renderTreeBeingDestroyed())
    62726272        compositor().layerWasAdded(*m_parent, *this);
    62736273}
    … …  
    62846284    m_zOrderListsDirty = true;
    62856285
    6286     if (!renderer().documentBeingDestroyed()) {
     6286    if (!renderer().renderTreeBeingDestroyed()) {
    62876287        if (isFlowThreadCollectingGraphicsLayersUnderRegions())
    62886288            downcast<RenderFlowThread>(renderer()).setNeedsLayerToRegionMappingsUpdate();
    … …  
    63086308    m_normalFlowListDirty = true;
    63096309
    6310     if (!renderer().documentBeingDestroyed()) {
     6310    if (!renderer().renderTreeBeingDestroyed()) {
    63116311        if (isFlowThreadCollectingGraphicsLayersUnderRegions())
    63126312            downcast<RenderFlowThread>(renderer()).setNeedsLayerToRegionMappingsUpdate();
    … …  
    67586758    if (parent() && (renderer().isOutOfFlowPositioned() != wasOutOfFlowPositioned)) {
    67596759        parent()->dirtyAncestorChainHasOutOfFlowPositionedDescendantStatus();
    6760         if (!renderer().documentBeingDestroyed() && acceleratedCompositingForOverflowScrollEnabled())
     6760        if (!renderer().renderTreeBeingDestroyed() && acceleratedCompositingForOverflowScrollEnabled())
    67616761            compositor().setShouldReevaluateCompositingAfterLayout();
    67626762    }
    … …  
    69196919void RenderLayer::removeReflection()
    69206920{
    6921     if (!m_reflection->documentBeingDestroyed())
     6921    if (!m_reflection->renderTreeBeingDestroyed())
    69226922        m_reflection->removeLayers(this);
    69236923

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerBacking.cpp

    r213810 r214761  
    27282728void RenderLayerBacking::notifyFlushRequired(const GraphicsLayer* layer)
    27292729{
    2730     if (renderer().documentBeingDestroyed())
     2730    if (renderer().renderTreeBeingDestroyed())
    27312731        return;
    27322732    compositor().scheduleLayerFlush(layer->canThrottleLayerFlush());

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r212484 r214761  
    11181118void RenderLayerCompositor::layerWillBeRemoved(RenderLayer& parent, RenderLayer& child)
    11191119{
    1120     if (!child.isComposited() || parent.renderer().documentBeingDestroyed())
     1120    if (!child.isComposited() || parent.renderer().renderTreeBeingDestroyed())
    11211121        return;
    11221122
    … …  
    17711771void RenderLayerCompositor::fixedRootBackgroundLayerChanged()
    17721772{
    1773     if (m_renderView.documentBeingDestroyed())
     1773    if (m_renderView.renderTreeBeingDestroyed())
    17741774        return;
    17751775

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLineBreak.cpp

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

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderNamedFlowFragment.cpp

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

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderObject.cpp

    r212615 r214761  
    221221        return;
    222222
    223     if (!documentBeingDestroyed() && is<RenderElement>(*this)) {
     223    if (!renderTreeBeingDestroyed() && is<RenderElement>(*this)) {
    224224        downcast<RenderElement>(*this).removeFromRenderFlowThread();
    225225        return;
    … …  
    14681468    removeFromParent();
    14691469
    1470     ASSERT(documentBeingDestroyed() || !is<RenderElement>(*this) || !view().frameView().hasSlowRepaintObject(downcast<RenderElement>(*this)));
     1470    ASSERT(renderTreeBeingDestroyed() || !is<RenderElement>(*this) || !view().frameView().hasSlowRepaintObject(downcast<RenderElement>(*this)));
    14711471
    14721472    // The remove() call above may invoke axObjectCache()->childrenChanged() on the parent, which may require the AX render
    … …  
    15061506{
    15071507    // If the tree is destroyed, there is no need for a clean-up phase.
    1508     if (documentBeingDestroyed()) {
     1508    if (renderTreeBeingDestroyed()) {
    15091509        destroy();
    15101510        return;

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderObject.h

    r212629 r214761  
    736736    virtual LayoutRect localCaretRect(InlineBox*, unsigned caretOffset, LayoutUnit* extraWidthToEndOfLine = nullptr);
    737737
    738     // When performing a global document tear-down, the renderer of the document is cleared.  We use this
    739     // as a hook to detect the case of document destruction and don't waste time doing unnecessary work.
    740     bool documentBeingDestroyed() const;
     738    // When performing a global document tear-down, or when going into the page cache, the renderer of the document is cleared.
     739    bool renderTreeBeingDestroyed() const;
    741740
    742741    void destroyAndCleanupAnonymousWrappers();
    … …  
    10211020}
    10221021
    1023 inline bool RenderObject::documentBeingDestroyed() const
     1022inline bool RenderObject::renderTreeBeingDestroyed() const
    10241023{
    10251024    return document().renderTreeBeingDestroyed();

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderQuote.cpp

    r208731 r214761  
    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();

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderRegion.cpp

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

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderReplaced.cpp

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

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderRubyRun.cpp

    r210145 r214761  
    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();

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderTable.h

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

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderText.cpp

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

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderVideo.cpp

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

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/svg/RenderSVGResource.cpp

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

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp

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

  • releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/svg/RenderSVGText.cpp

    r212562 r214761  
    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.