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

Unified Diff: Source/core/rendering/RootInlineBox.h

Issue 14383002: Apply FINAL to the RenderObject hierarchy. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase, add OVERRIDEs. Created 7 years, 8 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/rendering/RenderWordBreak.h ('k') | Source/core/rendering/svg/RenderSVGBlock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RootInlineBox.h
diff --git a/Source/core/rendering/RootInlineBox.h b/Source/core/rendering/RootInlineBox.h
index 6729d208645a2ee9edfbc704f6805603b65e47bd..fde491e5993339abe3b27d6d09eb0c9b19f8a9a9 100644
--- a/Source/core/rendering/RootInlineBox.h
+++ b/Source/core/rendering/RootInlineBox.h
@@ -37,16 +37,16 @@ class RootInlineBox : public InlineFlowBox {
public:
explicit RootInlineBox(RenderBlock*);
- virtual void destroy(RenderArena*) FINAL;
+ virtual void destroy(RenderArena*) OVERRIDE FINAL;
- virtual bool isRootInlineBox() const FINAL { return true; }
+ virtual bool isRootInlineBox() const OVERRIDE FINAL { return true; }
void detachEllipsisBox(RenderArena*);
RootInlineBox* nextRootBox() const { return static_cast<RootInlineBox*>(m_nextLineBox); }
RootInlineBox* prevRootBox() const { return static_cast<RootInlineBox*>(m_prevLineBox); }
- virtual void adjustPosition(float dx, float dy) FINAL;
+ virtual void adjustPosition(float dx, float dy) OVERRIDE FINAL;
LayoutUnit lineTop() const { return m_lineTop; }
LayoutUnit lineBottom() const { return m_lineBottom; }
@@ -84,7 +84,7 @@ public:
m_lineBottomWithLeading = bottomWithLeading;
}
- virtual RenderLineBoxList* rendererLineBoxes() const FINAL;
+ virtual RenderLineBoxList* rendererLineBoxes() const OVERRIDE FINAL;
RenderObject* lineBreakObj() const { return m_lineBreakObj; }
BidiStatus lineBreakBidiStatus() const;
@@ -113,8 +113,8 @@ public:
bool isHyphenated() const;
- virtual int baselinePosition(FontBaseline baselineType) const FINAL;
- virtual LayoutUnit lineHeight() const FINAL;
+ virtual int baselinePosition(FontBaseline baselineType) const OVERRIDE FINAL;
+ virtual LayoutUnit lineHeight() const OVERRIDE FINAL;
virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom);
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE FINAL;
@@ -122,7 +122,7 @@ public:
using InlineBox::hasSelectedChildren;
using InlineBox::setHasSelectedChildren;
- virtual RenderObject::SelectionState selectionState() FINAL;
+ virtual RenderObject::SelectionState selectionState() OVERRIDE FINAL;
InlineBox* firstSelectedBox();
InlineBox* lastSelectedBox();
@@ -144,9 +144,9 @@ public:
Vector<RenderBox*>* floatsPtr() { ASSERT(!isDirty()); return m_floats.get(); }
- virtual void extractLineBoxFromRenderObject() FINAL;
- virtual void attachLineBoxToRenderObject() FINAL;
- virtual void removeLineBoxFromRenderObject() FINAL;
+ virtual void extractLineBoxFromRenderObject() OVERRIDE FINAL;
+ virtual void attachLineBoxToRenderObject() OVERRIDE FINAL;
+ virtual void removeLineBoxFromRenderObject() OVERRIDE FINAL;
FontBaseline baselineType() const { return static_cast<FontBaseline>(m_baselineType); }
« no previous file with comments | « Source/core/rendering/RenderWordBreak.h ('k') | Source/core/rendering/svg/RenderSVGBlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698