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

Unified Diff: Source/core/rendering/InlineTextBox.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/InlineFlowBox.h ('k') | Source/core/rendering/RenderApplet.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/InlineTextBox.h
diff --git a/Source/core/rendering/InlineTextBox.h b/Source/core/rendering/InlineTextBox.h
index 4abe2f18f79568410f755bab84558e0b57cf0d3e..96f8a9dfd7602c280504e96422d5e58fd66324f1 100644
--- a/Source/core/rendering/InlineTextBox.h
+++ b/Source/core/rendering/InlineTextBox.h
@@ -57,7 +57,7 @@ public:
{
}
- virtual void destroy(RenderArena*) FINAL;
+ virtual void destroy(RenderArena*) OVERRIDE FINAL;
InlineTextBox* prevTextBox() const { return m_prevTextBox; }
InlineTextBox* nextTextBox() const { return m_nextTextBox; }
@@ -85,8 +85,8 @@ public:
static inline bool compareByStart(const InlineTextBox* first, const InlineTextBox* second) { return first->start() < second->start(); }
- virtual int baselinePosition(FontBaseline) const FINAL;
- virtual LayoutUnit lineHeight() const FINAL;
+ virtual int baselinePosition(FontBaseline) const OVERRIDE FINAL;
+ virtual LayoutUnit lineHeight() const OVERRIDE FINAL;
bool getEmphasisMarkPosition(RenderStyle*, TextEmphasisPosition&) const;
@@ -127,19 +127,19 @@ public:
RenderText* textRenderer() const;
private:
- virtual void deleteLine(RenderArena*) FINAL;
- virtual void extractLine() FINAL;
- virtual void attachLine() FINAL;
+ virtual void deleteLine(RenderArena*) OVERRIDE FINAL;
+ virtual void extractLine() OVERRIDE FINAL;
+ virtual void attachLine() OVERRIDE FINAL;
public:
- virtual RenderObject::SelectionState selectionState() FINAL;
+ virtual RenderObject::SelectionState selectionState() OVERRIDE FINAL;
private:
- virtual void clearTruncation() FINAL { m_truncation = cNoTruncation; }
+ virtual void clearTruncation() OVERRIDE FINAL { m_truncation = cNoTruncation; }
virtual float placeEllipsisBox(bool flowIsLTR, float visibleLeftEdge, float visibleRightEdge, float ellipsisWidth, float &truncatedWidth, bool& foundBox) OVERRIDE FINAL;
public:
- virtual bool isLineBreak() const FINAL;
+ virtual bool isLineBreak() const OVERRIDE FINAL;
void setExpansion(int newExpansion)
{
@@ -149,11 +149,11 @@ public:
}
private:
- virtual bool isInlineTextBox() const FINAL { return true; }
+ virtual bool isInlineTextBox() const OVERRIDE FINAL { return true; }
public:
- virtual int caretMinOffset() const FINAL;
- virtual int caretMaxOffset() const FINAL;
+ virtual int caretMinOffset() const OVERRIDE FINAL;
+ virtual int caretMaxOffset() const OVERRIDE FINAL;
private:
float textPos() const; // returns the x position relative to the left start of the text line.
« no previous file with comments | « Source/core/rendering/InlineFlowBox.h ('k') | Source/core/rendering/RenderApplet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698