Index: Source/core/rendering/InlineFlowBox.h |
diff --git a/Source/core/rendering/InlineFlowBox.h b/Source/core/rendering/InlineFlowBox.h |
index f6db02db5eaa9ac3918e2fe909c81b2d5247a2d1..f9a88bda17b76a25b3cd74716842932fa472d921 100644 |
--- a/Source/core/rendering/InlineFlowBox.h |
+++ b/Source/core/rendering/InlineFlowBox.h |
@@ -74,8 +74,8 @@ public: |
#endif |
#ifndef NDEBUG |
- virtual void showLineTreeAndMark(const InlineBox* = 0, const char* = 0, const InlineBox* = 0, const char* = 0, const RenderObject* = 0, int = 0) const OVERRIDE; |
- virtual const char* boxName() const OVERRIDE; |
+ virtual void showLineTreeAndMark(const InlineBox* = 0, const char* = 0, const InlineBox* = 0, const char* = 0, const RenderObject* = 0, int = 0) const override; |
+ virtual const char* boxName() const override; |
#endif |
InlineFlowBox* prevLineBox() const { return m_prevLineBox; } |
@@ -86,7 +86,7 @@ public: |
InlineBox* firstChild() const { checkConsistency(); return m_firstChild; } |
InlineBox* lastChild() const { checkConsistency(); return m_lastChild; } |
- virtual bool isLeaf() const OVERRIDE FINAL { return false; } |
+ virtual bool isLeaf() const override final { return false; } |
InlineBox* firstLeafChild() const; |
InlineBox* lastLeafChild() const; |
@@ -94,7 +94,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() OVERRIDE FINAL |
+ virtual void setConstructed() override final |
{ |
InlineBox::setConstructed(); |
for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) |
@@ -102,21 +102,21 @@ public: |
} |
void addToLine(InlineBox* child); |
- virtual void deleteLine() OVERRIDE FINAL; |
- virtual void extractLine() OVERRIDE FINAL; |
- virtual void attachLine() OVERRIDE FINAL; |
- virtual void adjustPosition(float dx, float dy) OVERRIDE; |
+ virtual void deleteLine() override final; |
+ virtual void extractLine() override final; |
+ virtual void attachLine() override final; |
+ virtual void adjustPosition(float dx, float dy) override; |
virtual void extractLineBoxFromRenderObject(); |
virtual void attachLineBoxToRenderObject(); |
virtual void removeLineBoxFromRenderObject(); |
- virtual void clearTruncation() OVERRIDE; |
+ virtual void clearTruncation() override; |
IntRect roundedFrameRect() const; |
- virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE; |
- virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE; |
+ virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override; |
+ virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) override; |
bool boxShadowCanBeAppliedToBackground(const FillLayer&) const; |
@@ -201,10 +201,10 @@ public: |
void removeChild(InlineBox* child, MarkLineBoxes); |
- virtual RenderObject::SelectionState selectionState() const OVERRIDE; |
+ virtual RenderObject::SelectionState selectionState() const override; |
- virtual bool canAccommodateEllipsis(bool ltr, int blockEdge, int ellipsisWidth) const OVERRIDE FINAL; |
- virtual float placeEllipsisBox(bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, float &truncatedWidth, bool&) OVERRIDE; |
+ virtual bool canAccommodateEllipsis(bool ltr, int blockEdge, int ellipsisWidth) const override final; |
+ virtual float placeEllipsisBox(bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, float &truncatedWidth, bool&) override; |
bool hasTextChildren() const { return m_hasTextChildren; } |
bool hasTextDescendants() const { return m_hasTextDescendants; } |
@@ -301,7 +301,7 @@ private: |
protected: |
OwnPtr<RenderOverflow> m_overflow; |
- virtual bool isInlineFlowBox() const OVERRIDE FINAL { return true; } |
+ virtual bool isInlineFlowBox() const override final { return true; } |
InlineBox* m_firstChild; |
InlineBox* m_lastChild; |