Index: Source/core/rendering/RenderFlexibleBox.h |
diff --git a/Source/core/rendering/RenderFlexibleBox.h b/Source/core/rendering/RenderFlexibleBox.h |
index c3390583d507595549cceffea526034bcefe1c05..e71872b9069299366d8685b7321ac43d55f438f6 100644 |
--- a/Source/core/rendering/RenderFlexibleBox.h |
+++ b/Source/core/rendering/RenderFlexibleBox.h |
@@ -43,27 +43,27 @@ public: |
static RenderFlexibleBox* createAnonymous(Document*); |
- virtual const char* renderName() const OVERRIDE; |
+ virtual const char* renderName() const override; |
- virtual bool isFlexibleBox() const OVERRIDE FINAL { return true; } |
- virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return false; } |
- virtual void layoutBlock(bool relayoutChildren) OVERRIDE FINAL; |
+ virtual bool isFlexibleBox() const override final { return true; } |
+ virtual bool canCollapseAnonymousBlockChild() const override { return false; } |
+ virtual void layoutBlock(bool relayoutChildren) override final; |
- virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE; |
- virtual int firstLineBoxBaseline() const OVERRIDE; |
- virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE; |
+ virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override; |
+ virtual int firstLineBoxBaseline() const override; |
+ virtual int inlineBlockBaseline(LineDirectionMode) const override; |
- virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; |
+ virtual void paintChildren(PaintInfo&, const LayoutPoint&) override final; |
bool isHorizontalFlow() const; |
OrderIterator& orderIterator() { return m_orderIterator; } |
protected: |
- virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE; |
+ virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override; |
- virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE; |
- virtual void removeChild(RenderObject*) OVERRIDE; |
+ virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override; |
+ virtual void removeChild(RenderObject*) override; |
private: |
enum FlexSign { |