Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1219)

Unified Diff: Source/core/layout/line/RootInlineBox.h

Issue 1231363003: Fix virtual/override/final usage in Source/core/layout/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/line/InlineTextBox.h ('k') | Source/core/layout/line/TrailingFloatsRootInlineBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/RootInlineBox.h
diff --git a/Source/core/layout/line/RootInlineBox.h b/Source/core/layout/line/RootInlineBox.h
index 05f988b1014a3ffc63b904c579f4f5eb82dd9ff0..72c8bbc856f087e52b56fd5411a1cc5d852d44f6 100644
--- a/Source/core/layout/line/RootInlineBox.h
+++ b/Source/core/layout/line/RootInlineBox.h
@@ -37,16 +37,16 @@ class RootInlineBox : public InlineFlowBox {
public:
explicit RootInlineBox(LayoutBlockFlow&);
- virtual void destroy() override final;
+ void destroy() final;
- virtual bool isRootInlineBox() const override final { return true; }
+ bool isRootInlineBox() const final { return true; }
void detachEllipsisBox();
RootInlineBox* nextRootBox() const { return static_cast<RootInlineBox*>(m_nextLineBox); }
RootInlineBox* prevRootBox() const { return static_cast<RootInlineBox*>(m_prevLineBox); }
- virtual void move(const LayoutSize&) override final;
+ void move(const LayoutSize&) final;
LayoutUnit lineTop() const { return m_lineTop; }
LayoutUnit lineBottom() const { return m_lineBottom; }
@@ -76,7 +76,7 @@ public:
m_selectionBottom = selectionBottom == LayoutUnit::min() ? bottom : selectionBottom;
}
- virtual LineBoxList* lineBoxes() const override final;
+ LineBoxList* lineBoxes() const final;
LayoutObject* lineBreakObj() const { return m_lineBreakObj; }
BidiStatus lineBreakBidiStatus() const;
@@ -94,23 +94,23 @@ public:
// Return the truncatedWidth, the width of the truncated text + ellipsis.
LayoutUnit placeEllipsis(const AtomicString& ellipsisStr, bool ltr, LayoutUnit blockLeftEdge, LayoutUnit blockRightEdge, LayoutUnit ellipsisWidth);
// Return the position of the EllipsisBox or -1.
- virtual LayoutUnit placeEllipsisBox(bool ltr, LayoutUnit blockLeftEdge, LayoutUnit blockRightEdge, LayoutUnit ellipsisWidth, LayoutUnit &truncatedWidth, bool& foundBox) override final;
+ LayoutUnit placeEllipsisBox(bool ltr, LayoutUnit blockLeftEdge, LayoutUnit blockRightEdge, LayoutUnit ellipsisWidth, LayoutUnit &truncatedWidth, bool& foundBox) final;
using InlineBox::hasEllipsisBox;
EllipsisBox* ellipsisBox() const;
- virtual void clearTruncation() override final;
+ void clearTruncation() final;
- virtual int baselinePosition(FontBaseline baselineType) const override final;
- virtual LayoutUnit lineHeight() const override final;
+ int baselinePosition(FontBaseline baselineType) const final;
+ LayoutUnit lineHeight() const final;
- virtual void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override;
- virtual bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) override final;
+ void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override;
+ bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) final;
using InlineBox::hasSelectedChildren;
using InlineBox::setHasSelectedChildren;
- virtual LayoutObject::SelectionState selectionState() const override final;
+ LayoutObject::SelectionState selectionState() const final;
InlineBox* firstSelectedBox() const;
InlineBox* lastSelectedBox() const;
@@ -132,9 +132,9 @@ public:
Vector<LayoutBox*>* floatsPtr() { ASSERT(!isDirty()); return m_floats.get(); }
- virtual void extractLineBoxFromLayoutObject() override final;
- virtual void attachLineBoxToLayoutObject() override final;
- virtual void removeLineBoxFromLayoutObject() override final;
+ void extractLineBoxFromLayoutObject() final;
+ void attachLineBoxToLayoutObject() final;
+ void removeLineBoxFromLayoutObject() final;
FontBaseline baselineType() const { return static_cast<FontBaseline>(m_baselineType); }
@@ -175,7 +175,7 @@ public:
Node* getLogicalStartBoxWithNode(InlineBox*&) const;
Node* getLogicalEndBoxWithNode(InlineBox*&) const;
- virtual const char* boxName() const override;
+ const char* boxName() const override;
private:
LayoutUnit beforeAnnotationsAdjustment() const;
« no previous file with comments | « Source/core/layout/line/InlineTextBox.h ('k') | Source/core/layout/line/TrailingFloatsRootInlineBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698