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

Unified Diff: Source/core/rendering/InlineFlowBox.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 | « no previous file | Source/core/rendering/InlineTextBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/InlineFlowBox.h
diff --git a/Source/core/rendering/InlineFlowBox.h b/Source/core/rendering/InlineFlowBox.h
index c5213c1ad2a2db0a4c546705849c73af3fa5e400..ea6b3b88aed0bda40182b11df3bebfe29b7a9cad 100644
--- a/Source/core/rendering/InlineFlowBox.h
+++ b/Source/core/rendering/InlineFlowBox.h
@@ -80,7 +80,7 @@ public:
InlineBox* firstChild() const { checkConsistency(); return m_firstChild; }
InlineBox* lastChild() const { checkConsistency(); return m_lastChild; }
- virtual bool isLeaf() const FINAL { return false; }
+ virtual bool isLeaf() const OVERRIDE FINAL { return false; }
InlineBox* firstLeafChild() const;
InlineBox* lastLeafChild() const;
@@ -88,7 +88,7 @@ public:
typedef void (*CustomInlineBoxRangeReverse)(void* userData, Vector<InlineBox*>::iterator first, Vector<InlineBox*>::iterator last);
void collectLeafBoxesInLogicalOrder(Vector<InlineBox*>&, CustomInlineBoxRangeReverse customReverseImplementation = 0, void* userData = 0) const;
- virtual void setConstructed() FINAL
+ virtual void setConstructed() OVERRIDE FINAL
{
InlineBox::setConstructed();
for (InlineBox* child = firstChild(); child; child = child->nextOnLine())
@@ -96,9 +96,9 @@ public:
}
void addToLine(InlineBox* child);
- 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;
virtual void adjustPosition(float dx, float dy);
virtual void extractLineBoxFromRenderObject();
@@ -109,8 +109,8 @@ public:
IntRect roundedFrameRect() const;
- virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&) FINAL;
- virtual void paintMask(PaintInfo&, const LayoutPoint&) FINAL;
+ void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
+ void paintMask(PaintInfo&, const LayoutPoint&);
void paintFillLayers(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, CompositeOperator = CompositeSourceOver);
void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, CompositeOperator = CompositeSourceOver);
void paintBoxShadow(const PaintInfo&, RenderStyle*, ShadowStyle, const LayoutRect&);
@@ -311,7 +311,7 @@ private:
protected:
OwnPtr<RenderOverflow> m_overflow;
- virtual bool isInlineFlowBox() const FINAL { return true; }
+ virtual bool isInlineFlowBox() const OVERRIDE FINAL { return true; }
InlineBox* m_firstChild;
InlineBox* m_lastChild;
« no previous file with comments | « no previous file | Source/core/rendering/InlineTextBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698