Index: Source/core/rendering/RenderBlockFlow.h |
diff --git a/Source/core/rendering/RenderBlockFlow.h b/Source/core/rendering/RenderBlockFlow.h |
index 8baa0fddfc06a4a1165f317cdc092c766cd8e69e..a6aaabb69660e327192be509fb3d525f45db7cf3 100644 |
--- a/Source/core/rendering/RenderBlockFlow.h |
+++ b/Source/core/rendering/RenderBlockFlow.h |
@@ -52,17 +52,17 @@ class RenderBlockFlow : public RenderBlock { |
public: |
explicit RenderBlockFlow(ContainerNode*); |
virtual ~RenderBlockFlow(); |
- virtual void trace(Visitor*) OVERRIDE; |
+ virtual void trace(Visitor*) override; |
static RenderBlockFlow* createAnonymous(Document*); |
- virtual bool isRenderBlockFlow() const OVERRIDE FINAL { return true; } |
+ virtual bool isRenderBlockFlow() const override final { return true; } |
- virtual void layoutBlock(bool relayoutChildren) OVERRIDE; |
+ virtual void layoutBlock(bool relayoutChildren) override; |
- virtual void computeOverflow(LayoutUnit oldClientAfterEdge, bool recomputeFloats = false) OVERRIDE; |
+ virtual void computeOverflow(LayoutUnit oldClientAfterEdge, bool recomputeFloats = false) override; |
- virtual void deleteLineBoxTree() OVERRIDE FINAL; |
+ virtual void deleteLineBoxTree() override final; |
LayoutUnit availableLogicalWidthForLine(LayoutUnit position, bool shouldIndentText, LayoutUnit logicalHeight = 0) const |
{ |
@@ -95,8 +95,8 @@ public: |
using RenderBlock::firstRootBox; |
using RenderBlock::lastRootBox; |
- virtual LayoutUnit logicalLeftSelectionOffset(const RenderBlock* rootBlock, LayoutUnit position) const OVERRIDE; |
- virtual LayoutUnit logicalRightSelectionOffset(const RenderBlock* rootBlock, LayoutUnit position) const OVERRIDE; |
+ virtual LayoutUnit logicalLeftSelectionOffset(const RenderBlock* rootBlock, LayoutUnit position) const override; |
+ virtual LayoutUnit logicalRightSelectionOffset(const RenderBlock* rootBlock, LayoutUnit position) const override; |
RootInlineBox* createAndAppendRootInlineBox(); |
@@ -108,7 +108,7 @@ public: |
void removeFloatingObjects(); |
- virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE; |
+ virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override; |
void moveAllChildrenIncludingFloatsTo(RenderBlock* toBlock, bool fullRemoveInsert); |
@@ -184,7 +184,7 @@ public: |
LayoutUnit paginationStrut() const { return m_rareData ? m_rareData->m_paginationStrut : LayoutUnit(); } |
void setPaginationStrut(LayoutUnit); |
- virtual bool avoidsFloats() const OVERRIDE; |
+ virtual bool avoidsFloats() const override; |
LayoutUnit xPositionForFloatIncludingMargin(const FloatingObject* child) const |
{ |
@@ -210,8 +210,8 @@ protected: |
void createFloatingObjects(); |
- virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) OVERRIDE; |
- virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE; |
+ virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) override; |
+ virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override; |
void addOverflowFromFloats(); |
@@ -225,7 +225,7 @@ protected: |
} |
virtual RenderObject* layoutSpecialExcludedChild(bool /*relayoutChildren*/, SubtreeLayoutScope&); |
- virtual bool updateLogicalWidthAndColumnWidth() OVERRIDE; |
+ virtual bool updateLogicalWidthAndColumnWidth() override; |
void setLogicalLeftForChild(RenderBox* child, LayoutUnit logicalLeft); |
void setLogicalTopForChild(RenderBox* child, LayoutUnit logicalTop); |
@@ -259,12 +259,12 @@ private: |
LayoutUnit lowestFloatLogicalBottom(FloatingObject::Type = FloatingObject::FloatLeftRight) const; |
LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit, ShapeOutsideFloatOffsetMode = ShapeOutsideFloatMarginBoxOffset) const; |
- virtual bool hitTestFloats(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset) OVERRIDE FINAL; |
+ virtual bool hitTestFloats(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset) override final; |
- virtual void invalidatePaintForOverhangingFloats(bool paintAllDescendants) OVERRIDE FINAL; |
- virtual void invalidatePaintForOverflow() OVERRIDE FINAL; |
- virtual void paintFloats(PaintInfo&, const LayoutPoint&, bool preservePhase = false) OVERRIDE FINAL; |
- virtual void clipOutFloatingObjects(const RenderBlock*, const PaintInfo*, const LayoutPoint&, const LayoutSize&) const OVERRIDE; |
+ virtual void invalidatePaintForOverhangingFloats(bool paintAllDescendants) override final; |
+ virtual void invalidatePaintForOverflow() override final; |
+ virtual void paintFloats(PaintInfo&, const LayoutPoint&, bool preservePhase = false) override final; |
+ virtual void clipOutFloatingObjects(const RenderBlock*, const PaintInfo*, const LayoutPoint&, const LayoutSize&) const override; |
void clearFloats(EClear); |
LayoutUnit logicalRightFloatOffsetForLine(LayoutUnit logicalTop, LayoutUnit fixedOffset, LayoutUnit logicalHeight) const; |
@@ -427,8 +427,8 @@ protected: |
virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const; |
private: |
- virtual LayoutUnit collapsedMarginBefore() const OVERRIDE FINAL { return maxPositiveMarginBefore() - maxNegativeMarginBefore(); } |
- virtual LayoutUnit collapsedMarginAfter() const OVERRIDE FINAL { return maxPositiveMarginAfter() - maxNegativeMarginAfter(); } |
+ virtual LayoutUnit collapsedMarginBefore() const override final { return maxPositiveMarginBefore() - maxNegativeMarginBefore(); } |
+ virtual LayoutUnit collapsedMarginAfter() const override final { return maxPositiveMarginAfter() - maxNegativeMarginAfter(); } |
LayoutUnit collapseMargins(RenderBox* child, MarginInfo&, bool childIsSelfCollapsing); |
LayoutUnit clearFloatsIfNeeded(RenderBox* child, MarginInfo&, LayoutUnit oldTopPosMargin, LayoutUnit oldTopNegMargin, LayoutUnit yPos, bool childIsSelfCollapsing); |
@@ -454,7 +454,7 @@ private: |
LayoutUnit m_paintInvalidationLogicalTop; |
LayoutUnit m_paintInvalidationLogicalBottom; |
- virtual bool isSelfCollapsingBlock() const OVERRIDE; |
+ virtual bool isSelfCollapsingBlock() const override; |
protected: |
OwnPtrWillBeMember<RenderBlockFlowRareData> m_rareData; |