| Index: Source/core/layout/LayoutListMarker.h
|
| diff --git a/Source/core/layout/LayoutListMarker.h b/Source/core/layout/LayoutListMarker.h
|
| index 76d1b0195ad3b8fcc4f9c890991093e7cf567966..54203a3d69297fdbbd564361bed53eada88f3937 100644
|
| --- a/Source/core/layout/LayoutListMarker.h
|
| +++ b/Source/core/layout/LayoutListMarker.h
|
| @@ -36,8 +36,7 @@ String listMarkerText(EListStyleType, int value);
|
| class LayoutListMarker final : public LayoutBox {
|
| public:
|
| static LayoutListMarker* createAnonymous(LayoutListItem*);
|
| -
|
| - virtual ~LayoutListMarker();
|
| + ~LayoutListMarker() override;
|
|
|
| const String& text() const { return m_text; }
|
|
|
| @@ -47,7 +46,7 @@ public:
|
|
|
| IntRect getRelativeMarkerRect();
|
| LayoutRect localSelectionRect();
|
| - virtual bool isImage() const override;
|
| + bool isImage() const override;
|
| const StyleImage* image() { return m_image.get(); }
|
| const LayoutListItem* listItem() { return m_listItem; }
|
|
|
| @@ -55,40 +54,40 @@ public:
|
|
|
| void listItemStyleDidChange();
|
|
|
| - virtual const char* name() const override { return "LayoutListMarker"; }
|
| + const char* name() const override { return "LayoutListMarker"; }
|
|
|
| protected:
|
| - virtual void willBeDestroyed() override;
|
| + void willBeDestroyed() override;
|
|
|
| private:
|
| LayoutListMarker(LayoutListItem*);
|
|
|
| - virtual void computePreferredLogicalWidths() override;
|
| + void computePreferredLogicalWidths() override;
|
|
|
| - virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectListMarker || LayoutBox::isOfType(type); }
|
| + bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectListMarker || LayoutBox::isOfType(type); }
|
|
|
| - virtual void paint(const PaintInfo&, const LayoutPoint&) override;
|
| + void paint(const PaintInfo&, const LayoutPoint&) override;
|
|
|
| - virtual void layout() override;
|
| + void layout() override;
|
|
|
| - virtual void imageChanged(WrappedImagePtr, const IntRect* = nullptr) override;
|
| + void imageChanged(WrappedImagePtr, const IntRect* = nullptr) override;
|
|
|
| - virtual InlineBox* createInlineBox() override;
|
| + InlineBox* createInlineBox() override;
|
|
|
| - virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
|
| - virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
|
| + LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
|
| + int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
|
|
|
| bool isText() const { return !isImage(); }
|
|
|
| - virtual void setSelectionState(SelectionState) override;
|
| - virtual LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer) const override;
|
| - virtual bool canBeSelectionLeaf() const override { return true; }
|
| + void setSelectionState(SelectionState) override;
|
| + LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer) const override;
|
| + bool canBeSelectionLeaf() const override { return true; }
|
|
|
| void updateMargins();
|
| void updateContent();
|
|
|
| - virtual void styleWillChange(StyleDifference, const ComputedStyle& newStyle) override;
|
| - virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
|
| + void styleWillChange(StyleDifference, const ComputedStyle& newStyle) override;
|
| + void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
|
|
|
| String m_text;
|
| RefPtr<StyleImage> m_image;
|
|
|