⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 176478 in webkit


Ignore:
Timestamp:
Nov 21, 2014, 3:39:16 PM (12 years ago)
Author:
akling@apple.com
Message:

RenderElement::removeChild() doesn't need a return value.
<​https://webkit.org/b/138985>

Reviewed by Pantti Koivisto.

Nobody uses the return value from RenderElement::removeChild().
Change it to return void and remove all the unnecessary plumbing.

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::removeChild):

  • rendering/RenderBlock.h:
  • rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::removeChild):

  • rendering/RenderBlockFlow.h:
  • rendering/RenderButton.cpp:

(WebCore::RenderButton::removeChild):

  • rendering/RenderButton.h:
  • rendering/RenderElement.cpp:

(WebCore::RenderElement::removeChild):
(WebCore::RenderElement::removeChildInternal):

  • rendering/RenderElement.h:
  • rendering/RenderMenuList.cpp:

(RenderMenuList::removeChild):

  • rendering/RenderMenuList.h:
  • rendering/RenderRuby.cpp:

(WebCore::RenderRubyAsInline::removeChild):
(WebCore::RenderRubyAsBlock::removeChild):

  • rendering/RenderRuby.h:
  • rendering/RenderRubyRun.cpp:

(WebCore::RenderRubyRun::removeChild):

  • rendering/RenderRubyRun.h:
  • rendering/mathml/RenderMathMLRoot.cpp:

(WebCore::RenderMathMLRootWrapper::removeChildWithoutRestructuring):
(WebCore::RenderMathMLRootWrapper::removeChild):

  • rendering/mathml/RenderMathMLRoot.h:
  • rendering/mathml/RenderMathMLScripts.cpp:

(WebCore::RenderMathMLScripts::removeChildInternal):
(WebCore::RenderMathMLScripts::removeChild):
(WebCore::RenderMathMLScriptsWrapper::removeChildInternal):
(WebCore::RenderMathMLScriptsWrapper::removeChild):

  • rendering/mathml/RenderMathMLScripts.h:
  • rendering/svg/RenderSVGContainer.cpp:

(WebCore::RenderSVGContainer::removeChild):

  • rendering/svg/RenderSVGContainer.h:
  • rendering/svg/RenderSVGInline.cpp:

(WebCore::RenderSVGInline::removeChild):

  • rendering/svg/RenderSVGInline.h:
  • rendering/svg/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::removeChild):

  • rendering/svg/RenderSVGRoot.h:
  • rendering/svg/RenderSVGText.cpp:

(WebCore::RenderSVGText::removeChild):

  • rendering/svg/RenderSVGText.h:
Location:
trunk/Source/WebCore
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r176477 r176478  
     12014-11-21  Andreas Kling  <akling@apple.com>
     2
     3        RenderElement::removeChild() doesn't need a return value.
     4        <https://webkit.org/b/138985>
     5
     6        Reviewed by Pantti Koivisto.
     7
     8        Nobody uses the return value from RenderElement::removeChild().
     9        Change it to return void and remove all the unnecessary plumbing.
     10
     11        * rendering/RenderBlock.cpp:
     12        (WebCore::RenderBlock::removeChild):
     13        * rendering/RenderBlock.h:
     14        * rendering/RenderBlockFlow.cpp:
     15        (WebCore::RenderBlockFlow::removeChild):
     16        * rendering/RenderBlockFlow.h:
     17        * rendering/RenderButton.cpp:
     18        (WebCore::RenderButton::removeChild):
     19        * rendering/RenderButton.h:
     20        * rendering/RenderElement.cpp:
     21        (WebCore::RenderElement::removeChild):
     22        (WebCore::RenderElement::removeChildInternal):
     23        * rendering/RenderElement.h:
     24        * rendering/RenderMenuList.cpp:
     25        (RenderMenuList::removeChild):
     26        * rendering/RenderMenuList.h:
     27        * rendering/RenderRuby.cpp:
     28        (WebCore::RenderRubyAsInline::removeChild):
     29        (WebCore::RenderRubyAsBlock::removeChild):
     30        * rendering/RenderRuby.h:
     31        * rendering/RenderRubyRun.cpp:
     32        (WebCore::RenderRubyRun::removeChild):
     33        * rendering/RenderRubyRun.h:
     34        * rendering/mathml/RenderMathMLRoot.cpp:
     35        (WebCore::RenderMathMLRootWrapper::removeChildWithoutRestructuring):
     36        (WebCore::RenderMathMLRootWrapper::removeChild):
     37        * rendering/mathml/RenderMathMLRoot.h:
     38        * rendering/mathml/RenderMathMLScripts.cpp:
     39        (WebCore::RenderMathMLScripts::removeChildInternal):
     40        (WebCore::RenderMathMLScripts::removeChild):
     41        (WebCore::RenderMathMLScriptsWrapper::removeChildInternal):
     42        (WebCore::RenderMathMLScriptsWrapper::removeChild):
     43        * rendering/mathml/RenderMathMLScripts.h:
     44        * rendering/svg/RenderSVGContainer.cpp:
     45        (WebCore::RenderSVGContainer::removeChild):
     46        * rendering/svg/RenderSVGContainer.h:
     47        * rendering/svg/RenderSVGInline.cpp:
     48        (WebCore::RenderSVGInline::removeChild):
     49        * rendering/svg/RenderSVGInline.h:
     50        * rendering/svg/RenderSVGRoot.cpp:
     51        (WebCore::RenderSVGRoot::removeChild):
     52        * rendering/svg/RenderSVGRoot.h:
     53        * rendering/svg/RenderSVGText.cpp:
     54        (WebCore::RenderSVGText::removeChild):
     55        * rendering/svg/RenderSVGText.h:
     56
    1572014-11-21  Tim Horton  <timothy_horton@apple.com>
    258

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

    r176387 r176478  
    688688}
    689689
    690 RenderObject* RenderBlock::removeChild(RenderObject& oldChild)
     690void RenderBlock::removeChild(RenderObject& oldChild)
    691691{
    692692    // No need to waste time in merging or removing empty anonymous blocks.
    693693    // We can just bail out if our document is getting destroyed.
    694     if (documentBeingDestroyed())
    695         return RenderBox::removeChild(oldChild);
     694    if (documentBeingDestroyed()) {
     695        RenderBox::removeChild(oldChild);
     696        return;
     697    }
    696698
    697699    // If this child is a block, and if our previous and next siblings are
    … …  
    746748    invalidateLineLayoutPath();
    747749
    748     RenderObject* nextSibling = RenderBox::removeChild(oldChild);
     750    RenderBox::removeChild(oldChild);
    749751
    750752    RenderObject* child = prev ? prev : next;
    … …  
    754756        // box.
    755757        collapseAnonymousBoxChild(*this, downcast<RenderBlock>(child));
    756         nextSibling = nullptr;
    757758    } else if (((prev && prev->isAnonymousBlock()) || (next && next->isAnonymousBlock())) && canCollapseAnonymousBlockChild()) {
    758759        // It's possible that the removal has knocked us down to a single anonymous
    … …  
    764765            && (!anonBlock->nextSibling() || (anonBlock->nextSibling()->style().styleType() != NOPSEUDO && anonBlock->nextSibling()->isFloating() && !anonBlock->nextSibling()->nextSibling()))) {
    765766            collapseAnonymousBoxChild(*this, anonBlock);
    766             nextSibling = nullptr;
    767767        }
    768768    }
    769769
    770770    if (!firstChild()) {
    771         nextSibling = nullptr;
    772 
    773771        // If this was our last child be sure to clear out our line boxes.
    774772        if (childrenInline())
    … …  
    801799        }
    802800    }
    803    
    804     return nextSibling;
    805801}
    806802

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

    r176365 r176478  
    7676
    7777    virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override;
    78     virtual RenderObject* removeChild(RenderObject&) override;
     78    virtual void removeChild(RenderObject&) override;
    7979
    8080    virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0);

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

    r176401 r176478  
    37073707}
    37083708
    3709 RenderObject* RenderBlockFlow::removeChild(RenderObject& oldChild)
     3709void RenderBlockFlow::removeChild(RenderObject& oldChild)
    37103710{
    37113711    if (!documentBeingDestroyed()) {
    … …  
    37143714            flowThread->flowThreadRelativeWillBeRemoved(&oldChild);
    37153715    }
    3716     return RenderBlock::removeChild(oldChild);
     3716    RenderBlock::removeChild(oldChild);
    37173717}
    37183718

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

    r175583 r176478  
    378378
    379379    virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override;
    380     virtual RenderObject* removeChild(RenderObject&) override;
     380    virtual void removeChild(RenderObject&) override;
    381381
    382382    void createMultiColumnFlowThread();

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

    r176459 r176478  
    7878}
    7979
    80 RenderObject* RenderButton::removeChild(RenderObject& oldChild)
     80void RenderButton::removeChild(RenderObject& oldChild)
    8181{
    8282    // m_inner should be the only child, but checking for direct children who
    … …  
    8585    if (&oldChild == m_inner || !m_inner || oldChild.parent() == this) {
    8686        ASSERT(&oldChild == m_inner || !m_inner);
    87         RenderObject* next = RenderFlexibleBox::removeChild(oldChild);
     87        RenderFlexibleBox::removeChild(oldChild);
    8888        m_inner = nullptr;
    89         return next;
    9089    } else
    91         return m_inner->removeChild(oldChild);
     90        m_inner->removeChild(oldChild);
    9291}
    9392

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

    r176459 r176478  
    4444
    4545    virtual void addChild(RenderObject* newChild, RenderObject *beforeChild = 0) override;
    46     virtual RenderObject* removeChild(RenderObject&) override;
     46    virtual void removeChild(RenderObject&) override;
    4747    virtual void removeLeftoverAnonymousBlock(RenderBlock*) override { }
    4848    virtual bool createsAnonymousWrapper() const override { return true; }

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

    r176365 r176478  
    515515}
    516516
    517 RenderObject* RenderElement::removeChild(RenderObject& oldChild)
    518 {
    519     return removeChildInternal(oldChild, NotifyChildren);
     517void RenderElement::removeChild(RenderObject& oldChild)
     518{
     519    removeChildInternal(oldChild, NotifyChildren);
    520520}
    521521
    … …  
    586586}
    587587
    588 RenderObject* RenderElement::removeChildInternal(RenderObject& oldChild, NotifyChildrenType notifyChildren)
     588void RenderElement::removeChildInternal(RenderObject& oldChild, NotifyChildrenType notifyChildren)
    589589{
    590590    ASSERT(canHaveChildren() || canHaveGeneratedChildren());
    … …  
    647647    if (AXObjectCache* cache = document().existingAXObjectCache())
    648648        cache->childrenChanged(this);
    649    
    650     return nextSibling;
    651649}
    652650

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

    r176365 r176478  
    8585    virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0);
    8686    virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild = 0) { return addChild(newChild, beforeChild); }
    87     virtual RenderObject* removeChild(RenderObject&);
     87    virtual void removeChild(RenderObject&);
    8888
    8989    // The following functions are used when the render tree hierarchy changes to make sure layers get
    … …  
    9797    enum NotifyChildrenType { NotifyChildren, DontNotifyChildren };
    9898    void insertChildInternal(RenderObject*, RenderObject* beforeChild, NotifyChildrenType);
    99     RenderObject* removeChildInternal(RenderObject&, NotifyChildrenType);
     99    void removeChildInternal(RenderObject&, NotifyChildrenType);
    100100
    101101    virtual RenderElement* hoverAncestor() const;

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

    r176258 r176478  
    182182}
    183183
    184 RenderObject* RenderMenuList::removeChild(RenderObject& oldChild)
     184void RenderMenuList::removeChild(RenderObject& oldChild)
    185185{
    186186    if (&oldChild == m_innerBlock || !m_innerBlock) {
    187         RenderObject* next = RenderFlexibleBox::removeChild(oldChild);
     187        RenderFlexibleBox::removeChild(oldChild);
    188188        m_innerBlock = 0;
    189         return next;
    190189    } else
    191         return m_innerBlock->removeChild(oldChild);
     190        m_innerBlock->removeChild(oldChild);
    192191}
    193192

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

    r174759 r176478  
    6767
    6868    virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override;
    69     virtual RenderObject* removeChild(RenderObject&) override;
     69    virtual void removeChild(RenderObject&) override;
    7070    virtual bool createsAnonymousWrapper() const override { return true; }
    7171

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

    r175807 r176478  
    200200}
    201201
    202 RenderObject* RenderRubyAsInline::removeChild(RenderObject& child)
     202void RenderRubyAsInline::removeChild(RenderObject& child)
    203203{
    204204    // If the child's parent is *this (must be a ruby run or generated content or anonymous block),
    … …  
    208208        ASSERT(isRubyChildForNormalRemoval(child));
    209209#endif
    210         return RenderInline::removeChild(child);
     210        RenderInline::removeChild(child);
     211        return;
    211212    }
    212213    // If the child's parent is an anoymous block (must be generated :before/:after content)
    … …  
    214215    if (isAnonymousRubyInlineBlock(child.parent())) {
    215216        ASSERT(child.isBeforeContent() || child.isAfterContent());
    216         RenderObject* next = child.parent()->removeChild(child);
     217        child.parent()->removeChild(child);
    217218        removeChild(*child.parent());
    218         return next;
     219        return;
    219220    }
    220221
    221222    // Otherwise find the containing run and remove it from there.
    222     RenderRubyRun& run = findRubyRunParent(child);
    223     return run.removeChild(child);
     223    findRubyRunParent(child).removeChild(child);
    224224}
    225225
    … …  
    306306}
    307307
    308 RenderObject* RenderRubyAsBlock::removeChild(RenderObject& child)
     308void RenderRubyAsBlock::removeChild(RenderObject& child)
    309309{
    310310    // If the child's parent is *this (must be a ruby run or generated content or anonymous block),
    … …  
    314314        ASSERT(isRubyChildForNormalRemoval(child));
    315315#endif
    316         return RenderBlockFlow::removeChild(child);
     316        RenderBlockFlow::removeChild(child);
     317        return;
    317318    }
    318319    // If the child's parent is an anoymous block (must be generated :before/:after content)
    … …  
    320321    if (isAnonymousRubyInlineBlock(child.parent())) {
    321322        ASSERT(child.isBeforeContent() || child.isAfterContent());
    322         RenderObject* next = child.parent()->removeChild(child);
     323        child.parent()->removeChild(child);
    323324        removeChild(*child.parent());
    324         return next;
     325        return;
    325326    }
    326327
    327328    // Otherwise find the containing run and remove it from there.
    328     RenderRubyRun& run = findRubyRunParent(child);
    329     return run.removeChild(child);
     329    findRubyRunParent(child).removeChild(child);
    330330}
    331331

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

    r174117 r176478  
    5858
    5959    virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
    60     virtual RenderObject* removeChild(RenderObject& child) override;
     60    virtual void removeChild(RenderObject& child) override;
    6161
    6262protected:
    … …  
    7878
    7979    virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
    80     virtual RenderObject* removeChild(RenderObject& child) override;
     80    virtual void removeChild(RenderObject& child) override;
    8181
    8282protected:

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

    r174875 r176478  
    157157}
    158158
    159 RenderObject* RenderRubyRun::removeChild(RenderObject& child)
     159void RenderRubyRun::removeChild(RenderObject& child)
    160160{
    161161    // If the child is a ruby text, then merge the ruby base with the base of
    … …  
    179179    }
    180180
    181     RenderObject* next = RenderBlockFlow::removeChild(child);
     181    RenderBlockFlow::removeChild(child);
    182182
    183183    if (!beingDestroyed() && !documentBeingDestroyed()) {
    … …  
    185185        RenderBlock* base = rubyBase();
    186186        if (base && !base->firstChild()) {
    187             next = RenderBlockFlow::removeChild(*base);
     187            RenderBlockFlow::removeChild(*base);
    188188            base->deleteLines();
    189189            base->destroy();
    … …  
    195195            deleteLines();
    196196            destroy();
    197             next = nullptr;
    198         }
    199     }
    200    
    201     return next;
     197        }
     198    }
    202199}
    203200

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

    r175084 r176478  
    5959    virtual bool isChildAllowed(const RenderObject&, const RenderStyle&) const override;
    6060    virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
    61     virtual RenderObject* removeChild(RenderObject&) override;
     61    virtual void removeChild(RenderObject&) override;
    6262
    6363    virtual RenderBlock* firstLineBlock() const override;

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp

    r176258 r176478  
    350350}
    351351
    352 RenderObject* RenderMathMLRootWrapper::removeChildWithoutRestructuring(RenderObject& child)
    353 {
    354     return RenderMathMLBlock::removeChild(child);
    355 }
    356 
    357 RenderObject* RenderMathMLRootWrapper::removeChild(RenderObject& child)
    358 {
    359     RenderObject* next = RenderMathMLBlock::removeChild(child);
     352void RenderMathMLRootWrapper::removeChildWithoutRestructuring(RenderObject& child)
     353{
     354    RenderMathMLBlock::removeChild(child);
     355}
     356
     357void RenderMathMLRootWrapper::removeChild(RenderObject& child)
     358{
     359    RenderMathMLBlock::removeChild(child);
    360360
    361361    if (!(beingDestroyed() || documentBeingDestroyed()))
    362362        downcast<RenderMathMLRoot>(*parent()).restructureWrappers();
    363 
    364     return next;
    365363}
    366364

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h

    r176447 r176478  
    8484
    8585private:
    86     RenderObject* removeChildWithoutRestructuring(RenderObject&);
    87     virtual RenderObject* removeChild(RenderObject&) override;
     86    void removeChildWithoutRestructuring(RenderObject&);
     87    virtual void removeChild(RenderObject&) override;
    8888    static RenderPtr<RenderMathMLRootWrapper> createAnonymousWrapper(RenderMathMLRoot* renderObject);
    8989    virtual bool isRenderMathMLRootWrapper() const override { return true; }

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp

    r176465 r176478  
    199199}
    200200
    201 RenderObject* RenderMathMLScripts::removeChildInternal(bool doNotRestructure, RenderObject& child)
    202 {
    203     if (doNotRestructure)
    204         return RenderMathMLBlock::removeChild(child);
     201void RenderMathMLScripts::removeChildInternal(bool doNotRestructure, RenderObject& child)
     202{
     203    if (doNotRestructure) {
     204        RenderMathMLBlock::removeChild(child);
     205        return;
     206    }
    205207
    206208    ASSERT(isPrescript(child));
    … …  
    221223    }
    222224
    223     return RenderMathMLBlock::removeChild(child);
     225    RenderMathMLBlock::removeChild(child);
    224226}
    225227
    … …  
    236238}
    237239
    238 RenderObject* RenderMathMLScripts::removeChild(RenderObject& child)
     240void RenderMathMLScripts::removeChild(RenderObject& child)
    239241{
    240242    if (beingDestroyed() || documentBeingDestroyed()) {
    241243        // The renderer is being destroyed so we remove the child normally.
    242         return RenderMathMLBlock::removeChild(child);
    243     }
    244 
    245     RenderObject* next = removeChildInternal(false, child);
    246    
     244        RenderMathMLBlock::removeChild(child);
     245        return;
     246    }
     247
     248    removeChildInternal(false, child);
    247249    fixAnonymousStyles();
    248    
    249     return next;
    250250}
    251251
    … …  
    462462}
    463463
    464 RenderObject* RenderMathMLScriptsWrapper::removeChildInternal(bool doNotRestructure, RenderObject& child)
    465 {
    466     if (doNotRestructure)
    467         return RenderMathMLBlock::removeChild(child);
     464void RenderMathMLScriptsWrapper::removeChildInternal(bool doNotRestructure, RenderObject& child)
     465{
     466    if (doNotRestructure) {
     467        RenderMathMLBlock::removeChild(child);
     468        return;
     469    }
    468470
    469471    RenderMathMLScripts* parentNode = downcast<RenderMathMLScripts>(parent());
    … …  
    480482            RenderMathMLBlock::addChild(script);
    481483        }
    482         return sibling;
     484        return;
    483485    }
    484486
    485487    // We remove the child and shift the successors in the current sequence of scripts.
    486     RenderObject* next = RenderMathMLBlock::removeChild(child);
     488    RenderMathMLBlock::removeChild(child);
    487489    RenderMathMLScriptsWrapper* subSupPair = this;
    488490    for (RenderObject* nextSibling = subSupPair->nextSibling(); nextSibling && !isPrescript(*nextSibling); nextSibling = nextSibling->nextSibling()) {
    … …  
    499501        subSupPair->destroy();
    500502    }
    501    
    502     return next;
    503 }
    504 
    505 RenderObject* RenderMathMLScriptsWrapper::removeChild(RenderObject& child)
     503}
     504
     505void RenderMathMLScriptsWrapper::removeChild(RenderObject& child)
    506506{
    507507    if (beingDestroyed() || documentBeingDestroyed()) {
    508508        // The renderer is being destroyed so we remove the child normally.
    509         return RenderMathMLBlock::removeChild(child);
     509        RenderMathMLBlock::removeChild(child);
     510        return;
    510511    }
    511512
    512513    RenderMathMLScripts* parentNode = downcast<RenderMathMLScripts>(parent());
    513     RenderObject* next = removeChildInternal(false, child);
     514    removeChildInternal(false, child);
    514515    parentNode->fixAnonymousStyles();
    515     return next;
    516516}
    517517

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h

    r175084 r176478  
    4444
    4545    virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
    46     virtual RenderObject* removeChild(RenderObject&) override;
     46    virtual void removeChild(RenderObject&) override;
    4747
    4848private:
    … …  
    5656
    5757    void addChildInternal(bool normalInsertion, RenderObject* child, RenderObject* beforeChild = 0);
    58     RenderObject* removeChildInternal(bool normalRemoval, RenderObject& child);
     58    void removeChildInternal(bool normalRemoval, RenderObject& child);
    5959
    6060    virtual const char* renderName() const override { return m_kind == Base ? "Base Wrapper" : "SubSupPair Wrapper"; }
    … …  
    7474    RenderMathMLScripts(Element&, PassRef<RenderStyle>);
    7575    virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
    76     virtual RenderObject* removeChild(RenderObject&) override;
     76    virtual void removeChild(RenderObject&) override;
    7777   
    7878    virtual RenderMathMLOperator* unembellishedOperator() override;
    … …  
    8484private:
    8585    void addChildInternal(bool normalInsertion, RenderObject* child, RenderObject* beforeChild = 0);
    86     RenderObject* removeChildInternal(bool normalRemoval, RenderObject& child);
     86    void removeChildInternal(bool normalRemoval, RenderObject& child);
    8787
    8888    virtual bool isRenderMathMLScripts() const override { return true; }

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

    r173325 r176478  
    9494}
    9595
    96 RenderObject* RenderSVGContainer::removeChild(RenderObject& child)
     96void RenderSVGContainer::removeChild(RenderObject& child)
    9797{
    9898    SVGResourcesCache::clientWillBeRemovedFromTree(child);
    99     return RenderSVGModelObject::removeChild(child);
     99    RenderSVGModelObject::removeChild(child);
    100100}
    101101

  • trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h

    r175084 r176478  
    5050
    5151    virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override final;
    52     virtual RenderObject* removeChild(RenderObject&) override final;
     52    virtual void removeChild(RenderObject&) override final;
    5353    virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override final;
    5454

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

    r170774 r176478  
    130130}
    131131
    132 RenderObject* RenderSVGInline::removeChild(RenderObject& child)
     132void RenderSVGInline::removeChild(RenderObject& child)
    133133{
    134134    SVGResourcesCache::clientWillBeRemovedFromTree(child);
    135135
    136136    auto* textAncestor = RenderSVGText::locateRenderSVGTextAncestor(*this);
    137     if (!textAncestor)
    138         return RenderInline::removeChild(child);
     137    if (!textAncestor) {
     138        RenderInline::removeChild(child);
     139        return;
     140    }
    139141
    140142    Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
    141143    textAncestor->subtreeChildWillBeRemoved(&child, affectedAttributes);
    142     RenderObject* next = RenderInline::removeChild(child);
     144    RenderInline::removeChild(child);
    143145    textAncestor->subtreeChildWasRemoved(affectedAttributes);
    144     return next;
    145146}
    146147

  • trunk/Source/WebCore/rendering/svg/RenderSVGInline.h

    r174542 r176478  
    6363
    6464    virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override final;
    65     virtual RenderObject* removeChild(RenderObject&) override final;
     65    virtual void removeChild(RenderObject&) override final;
    6666};
    6767

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

    r174854 r176478  
    311311}
    312312
    313 RenderObject* RenderSVGRoot::removeChild(RenderObject& child)
     313void RenderSVGRoot::removeChild(RenderObject& child)
    314314{
    315315    SVGResourcesCache::clientWillBeRemovedFromTree(child);
    316     return RenderReplaced::removeChild(child);
     316    RenderReplaced::removeChild(child);
    317317}
    318318

  • trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h

    r175084 r176478  
    8181    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
    8282    virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
    83     virtual RenderObject* removeChild(RenderObject&) override;
     83    virtual void removeChild(RenderObject&) override;
    8484
    8585    virtual const AffineTransform& localToParentTransform() const override;

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

    r174854 r176478  
    540540}
    541541
    542 RenderObject* RenderSVGText::removeChild(RenderObject& child)
     542void RenderSVGText::removeChild(RenderObject& child)
    543543{
    544544    SVGResourcesCache::clientWillBeRemovedFromTree(child);
    … …  
    547547    FontCachePurgePreventer fontCachePurgePreventer;
    548548    subtreeChildWillBeRemoved(&child, affectedAttributes);
    549     RenderObject* next = RenderSVGBlock::removeChild(child);
     549    RenderSVGBlock::removeChild(child);
    550550    subtreeChildWasRemoved(affectedAttributes);
    551     return next;
    552551}
    553552

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

    r175084 r176478  
    8585    virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
    8686    virtual void addChild(RenderObject* child, RenderObject* beforeChild = nullptr) override;
    87     virtual RenderObject* removeChild(RenderObject&) override;
     87    virtual void removeChild(RenderObject&) override;
    8888    virtual void willBeDestroyed() override;
    8989
Note: See TracChangeset for help on using the changeset viewer.