Ignore:
Timestamp:
Mar 29, 2015, 7:00:20 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

nullptr cleanup in RenderFooBox classes
​https://bugs.webkit.org/show_bug.cgi?id=143182

Patch by Joonghun Park <​jh718.park@samsung.com> on 2015-03-29
Reviewed by Ryosuke Niwa.

No new tests, no behavior changes

Replace 0 with nullptr in RenderFooBox classes.

  • rendering/RenderBox.cpp:

(WebCore::RenderBox::RenderBox):
(WebCore::RenderBox::paintFillLayer):
(WebCore::RenderBox::shrinkLogicalWidthToAvoidFloats):
(WebCore::RenderBox::containingBlockAvailableLineWidthInRegion):
(WebCore::RenderBox::renderBoxRegionInfo):
(WebCore::RenderBox::computePositionedLogicalWidthUsing):
(WebCore::RenderBox::computePositionedLogicalHeightUsing):
(WebCore::RenderBox::computePositionedLogicalWidthReplaced):
(WebCore::RenderBox::positionForPoint):
(WebCore::RenderBox::layoutOverflowRectForPropagation):

  • rendering/RenderBox.h:

(WebCore::RenderBox::setMarginBefore):
(WebCore::RenderBox::setMarginAfter):
(WebCore::RenderBox::setMarginStart):
(WebCore::RenderBox::setMarginEnd):
(WebCore::RenderBox::createAnonymousBoxWithSameTypeAs):
(WebCore::RenderBox::setInlineBoxWrapper):

  • rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::willBeDestroyed):
(WebCore::RenderBoxModelObject::paintMaskForTextFillBox):
(WebCore::RenderBoxModelObject::paintBorderSides):
(WebCore::RenderBoxModelObject::firstLetterRemainingText):

  • rendering/RenderBoxModelObject.h:

(WebCore::RenderBoxModelObject::moveChildTo):
(WebCore::RenderBoxModelObject::moveAllChildrenTo):
(WebCore::RenderBoxModelObject::moveChildrenTo):

  • rendering/RenderDeprecatedFlexibleBox.cpp:

(WebCore::FlexBoxIterator::reset):
(WebCore::FlexBoxIterator::next):

  • rendering/RenderDeprecatedFlexibleBox.h:
  • rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::firstLineBaseline):
(WebCore::RenderFlexibleBox::computeMainAxisExtentForChild):

  • rendering/RenderLineBoxList.cpp:

(WebCore::RenderLineBoxList::deleteLineBoxTree):
(WebCore::RenderLineBoxList::extractLineBox):
(WebCore::RenderLineBoxList::deleteLineBoxes):
(WebCore::RenderLineBoxList::checkConsistency):

  • rendering/RenderLineBoxList.h:

(WebCore::RenderLineBoxList::RenderLineBoxList):

  • rendering/RenderListBox.cpp:

(WebCore::RenderListBox::enclosingScrollableArea):
(WebCore::RenderListBox::setHasVerticalScrollbar):

  • rendering/RenderListBox.h:
File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r181505 r182127  
    8686    LayoutUnit logicalHeight() const { return style().isHorizontalWritingMode() ? height() : width(); }
    8787
    88     LayoutUnit constrainLogicalWidthInRegionByMinMax(LayoutUnit, LayoutUnit, RenderBlock*, RenderRegion* = 0) const;
     88    LayoutUnit constrainLogicalWidthInRegionByMinMax(LayoutUnit, LayoutUnit, RenderBlock*, RenderRegion* = nullptr) const;
    8989    LayoutUnit constrainLogicalHeightByMinMax(LayoutUnit) const;
    9090    LayoutUnit constrainContentBoxLogicalHeightByMinMax(LayoutUnit) const;
    … …  
    175175    // Bounds of the outline box in absolute coords. Respects transforms
    176176    virtual LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* /*repaintContainer*/, const RenderGeometryMap*) const override final;
    177     virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override;
     177    virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = nullptr) override;
    178178   
    179179    virtual FloatRect repaintRectInLocalCoordinates() const override { return borderBoxRect(); }
    … …  
    265265    LayoutUnit marginLogicalRight() const { return m_marginBox.logicalRight(style().writingMode()); }
    266266   
    267     virtual LayoutUnit marginBefore(const RenderStyle* overrideStyle = 0) const override final { return m_marginBox.before((overrideStyle ? overrideStyle : &style())->writingMode()); }
    268     virtual LayoutUnit marginAfter(const RenderStyle* overrideStyle = 0) const override final { return m_marginBox.after((overrideStyle ? overrideStyle : &style())->writingMode()); }
    269     virtual LayoutUnit marginStart(const RenderStyle* overrideStyle = 0) const override final
     267    virtual LayoutUnit marginBefore(const RenderStyle* overrideStyle = nullptr) const override final { return m_marginBox.before((overrideStyle ? overrideStyle : &style())->writingMode()); }
     268    virtual LayoutUnit marginAfter(const RenderStyle* overrideStyle = nullptr) const override final { return m_marginBox.after((overrideStyle ? overrideStyle : &style())->writingMode()); }
     269    virtual LayoutUnit marginStart(const RenderStyle* overrideStyle = nullptr) const override final
    270270    {
    271271        const RenderStyle* styleToUse = overrideStyle ? overrideStyle : &style();
    272272        return m_marginBox.start(styleToUse->writingMode(), styleToUse->direction());
    273273    }
    274     virtual LayoutUnit marginEnd(const RenderStyle* overrideStyle = 0) const override final
     274    virtual LayoutUnit marginEnd(const RenderStyle* overrideStyle = nullptr) const override final
    275275    {
    276276        const RenderStyle* styleToUse = overrideStyle ? overrideStyle : &style();
    277277        return m_marginBox.end(styleToUse->writingMode(), styleToUse->direction());
    278278    }
    279     void setMarginBefore(LayoutUnit value, const RenderStyle* overrideStyle = 0) { m_marginBox.setBefore((overrideStyle ? overrideStyle : &style())->writingMode(), value); }
    280     void setMarginAfter(LayoutUnit value, const RenderStyle* overrideStyle = 0) { m_marginBox.setAfter((overrideStyle ? overrideStyle : &style())->writingMode(), value); }
    281     void setMarginStart(LayoutUnit value, const RenderStyle* overrideStyle = 0)
     279    void setMarginBefore(LayoutUnit value, const RenderStyle* overrideStyle = nullptr) { m_marginBox.setBefore((overrideStyle ? overrideStyle : &style())->writingMode(), value); }
     280    void setMarginAfter(LayoutUnit value, const RenderStyle* overrideStyle = nullptr) { m_marginBox.setAfter((overrideStyle ? overrideStyle : &style())->writingMode(), value); }
     281    void setMarginStart(LayoutUnit value, const RenderStyle* overrideStyle = nullptr)
    282282    {
    283283        const RenderStyle* styleToUse = overrideStyle ? overrideStyle : &style();
    284284        m_marginBox.setStart(styleToUse->writingMode(), styleToUse->direction(), value);
    285285    }
    286     void setMarginEnd(LayoutUnit value, const RenderStyle* overrideStyle = 0)
     286    void setMarginEnd(LayoutUnit value, const RenderStyle* overrideStyle = nullptr)
    287287    {
    288288        const RenderStyle* styleToUse = overrideStyle ? overrideStyle : &style();
    … …  
    339339#endif
    340340
    341     virtual LayoutSize offsetFromContainer(RenderElement&, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const override;
     341    virtual LayoutSize offsetFromContainer(RenderElement&, const LayoutPoint&, bool* offsetDependsOnPoint = nullptr) const override;
    342342   
    343343    LayoutUnit adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit width) const;
    … …  
    414414
    415415    RenderBoxRegionInfo* renderBoxRegionInfo(RenderRegion*, RenderBoxRegionInfoFlags = CacheRenderBoxRegionInfo) const;
    416     void computeLogicalWidthInRegion(LogicalExtentComputedValues&, RenderRegion* = 0) const;
     416    void computeLogicalWidthInRegion(LogicalExtentComputedValues&, RenderRegion* = nullptr) const;
    417417
    418418    bool stretchesToViewport() const
    … …  
    460460    int scrollbarLogicalHeight() const { return style().isHorizontalWritingMode() ? horizontalScrollbarHeight() : verticalScrollbarWidth(); }
    461461    virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint());
    462     virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0);
     462    virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr);
    463463    bool canBeScrolledAndHasScrollableArea() const;
    464464    virtual bool canBeProgramaticallyScrolled() const;
    … …  
    483483    bool isUnsplittableForPagination() const;
    484484
    485     virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) override;
     485    virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = nullptr) override;
    486486
    487487    virtual LayoutRect overflowClipRect(const LayoutPoint& location, RenderRegion*, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize, PaintPhase = PaintPhaseBlockBackground);
    … …  
    497497    virtual void paintMask(PaintInfo&, const LayoutPoint&);
    498498    virtual void paintClippingMask(PaintInfo&, const LayoutPoint&);
    499     virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
     499    virtual void imageChanged(WrappedImagePtr, const IntRect* = nullptr) override;
    500500
    501501    // Called when a positioned object moves but doesn't necessarily change size.  A simplified layout is attempted
    … …  
    594594    {
    595595        ASSERT_NOT_REACHED();
    596         return 0;
     596        return nullptr;
    597597    }
    598598
    … …  
    641641    bool backgroundHasOpaqueTopLayer() const;
    642642
    643     void computePositionedLogicalWidth(LogicalExtentComputedValues&, RenderRegion* = 0) const;
     643    void computePositionedLogicalWidth(LogicalExtentComputedValues&, RenderRegion* = nullptr) const;
    644644
    645645    LayoutUnit computeIntrinsicLogicalWidthUsing(Length logicalWidthLength, LayoutUnit availableLogicalWidth, LayoutUnit borderAndPadding) const;
    … …  
    678678    bool skipContainingBlockForPercentHeightCalculation(const RenderBox* containingBlock, bool isPerpendicularWritingMode) const;
    679679   
    680     LayoutUnit containingBlockLogicalWidthForPositioned(const RenderBoxModelObject* containingBlock, RenderRegion* = 0, bool checkForPerpendicularWritingMode = true) const;
     680    LayoutUnit containingBlockLogicalWidthForPositioned(const RenderBoxModelObject* containingBlock, RenderRegion* = nullptr, bool checkForPerpendicularWritingMode = true) const;
    681681    LayoutUnit containingBlockLogicalHeightForPositioned(const RenderBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode = true) const;
    682682
    … …  
    765765        // only one will be notified when the renderer is getting destroyed. The second line box wrapper
    766766        // will keep a stale reference.
    767         if (UNLIKELY(m_inlineBoxWrapper != 0))
     767        if (UNLIKELY(m_inlineBoxWrapper != nullptr))
    768768            deleteLineBoxWrapper();
    769769    }
Note: See TracChangeset for help on using the changeset viewer.