Index: Source/core/rendering/RenderBlock.h |
diff --git a/Source/core/rendering/RenderBlock.h b/Source/core/rendering/RenderBlock.h |
index 2a8f1eb8a3286397552de7670a5306eaf2798ba3..7ed0b8124926979091f130c1924faa0ed8a6dde6 100644 |
--- a/Source/core/rendering/RenderBlock.h |
+++ b/Source/core/rendering/RenderBlock.h |
@@ -59,8 +59,8 @@ ContinuationOutlineTableMap* continuationOutlineTable(); |
class RenderBlock : public RenderBox { |
public: |
- virtual void destroy() OVERRIDE; |
- virtual void trace(Visitor*) OVERRIDE; |
+ virtual void destroy() override; |
+ virtual void trace(Visitor*) override; |
friend class LineLayoutState; |
protected: |
@@ -81,8 +81,8 @@ public: |
bool beingDestroyed() const { return m_beingDestroyed; } |
// These two functions are overridden for inline-block. |
- virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL; |
- virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE; |
+ virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override final; |
+ virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override; |
LayoutUnit minLineHeightForReplacedRenderer(bool isFirstLine, LayoutUnit replacedHeight) const; |
@@ -99,8 +99,8 @@ public: |
// FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow |
virtual void deleteLineBoxTree(); |
- virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE; |
- virtual void removeChild(RenderObject*) OVERRIDE; |
+ virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override; |
+ virtual void removeChild(RenderObject*) override; |
virtual void layoutBlock(bool relayoutChildren); |
@@ -144,14 +144,14 @@ public: |
void markPositionedObjectsForLayout(); |
// FIXME: Do we really need this to be virtual? It's just so we can call this on |
// RenderBoxes without needed to check whether they're RenderBlocks first. |
- virtual void markForPaginationRelayoutIfNeeded(SubtreeLayoutScope&) OVERRIDE FINAL; |
+ virtual void markForPaginationRelayoutIfNeeded(SubtreeLayoutScope&) override final; |
LayoutUnit textIndentOffset() const; |
- virtual PositionWithAffinity positionForPoint(const LayoutPoint&) OVERRIDE; |
+ virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override; |
// Block flows subclass availableWidth to handle multi column layout (shrinking the width available to children when laying out.) |
- virtual LayoutUnit availableLogicalWidth() const OVERRIDE FINAL; |
+ virtual LayoutUnit availableLogicalWidth() const override final; |
LayoutPoint flipForWritingModeIncludingColumns(const LayoutPoint&) const; |
void adjustStartEdgeForWritingModeIncludingColumns(LayoutRect&) const; |
@@ -159,7 +159,7 @@ public: |
LayoutUnit blockDirectionOffset(const LayoutSize& offsetFromBlock) const; |
LayoutUnit inlineDirectionOffset(const LayoutSize& offsetFromBlock) const; |
- virtual bool shouldPaintSelectionGaps() const OVERRIDE FINAL; |
+ virtual bool shouldPaintSelectionGaps() const override final; |
GapRects selectionGapRectsForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer) const; |
LayoutRect logicalLeftSelectionGap(const RenderBlock* rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock, |
const RenderObject* selObj, LayoutUnit logicalLeft, LayoutUnit logicalTop, LayoutUnit logicalHeight, const PaintInfo*) const; |
@@ -168,7 +168,7 @@ public: |
void getSelectionGapInfo(SelectionState, bool& leftGap, bool& rightGap) const; |
RenderBlock* blockBeforeWithinSelectionRoot(LayoutSize& offset) const; |
- virtual void setSelectionState(SelectionState) OVERRIDE; |
+ virtual void setSelectionState(SelectionState) override; |
LayoutRect logicalRectToPhysicalRect(const LayoutPoint& physicalPosition, const LayoutRect& logicalRect) const; |
@@ -179,12 +179,12 @@ public: |
void clearTruncation(); |
void adjustRectForColumns(LayoutRect&) const; |
- virtual LayoutSize columnOffset(const LayoutPoint&) const OVERRIDE; |
+ virtual LayoutSize columnOffset(const LayoutPoint&) const override; |
void adjustForColumnRect(LayoutSize& offset, const LayoutPoint& locationInContainer) const; |
void addContinuationWithOutline(RenderInline*); |
- virtual RenderBoxModelObject* virtualContinuation() const OVERRIDE FINAL { return continuation(); } |
+ virtual RenderBoxModelObject* virtualContinuation() const override final { return continuation(); } |
bool isAnonymousBlockContinuation() const { return continuation() && isAnonymousBlock(); } |
RenderInline* inlineElementContinuation() const; |
RenderBlock* blockElementContinuation() const; |
@@ -199,7 +199,7 @@ public: |
RenderBlockFlow* createAnonymousColumnsBlock() const { return createAnonymousColumnsWithParentRenderer(this); } |
RenderBlockFlow* createAnonymousColumnSpanBlock() const { return createAnonymousColumnSpanWithParentRenderer(this); } |
- virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const OVERRIDE; |
+ virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const override; |
ColumnInfo* columnInfo() const; |
int columnGap() const; |
@@ -230,7 +230,7 @@ public: |
LayoutUnit collapsedMarginAfterForChild(const RenderBox* child) const; |
virtual void updateFirstLetter(); |
- virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE; |
+ virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override; |
virtual void scrollbarsChanged(bool /*horizontalScrollbarChanged*/, bool /*verticalScrollbarChanged*/) { } |
@@ -258,12 +258,12 @@ public: |
bool recalcOverflowAfterStyleChange(); |
protected: |
- virtual void willBeDestroyed() OVERRIDE; |
+ virtual void willBeDestroyed() override; |
void dirtyForLayoutFromPercentageHeightDescendants(SubtreeLayoutScope&); |
- virtual void layout() OVERRIDE; |
- virtual bool updateImageLoadingPriorities() OVERRIDE FINAL; |
+ virtual void layout() override; |
+ virtual bool updateImageLoadingPriorities() override final; |
enum PositionedLayoutBehavior { |
DefaultLayout, |
@@ -278,9 +278,9 @@ protected: |
int beforeMarginInLineDirection(LineDirectionMode) const; |
- virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; |
+ virtual void paint(PaintInfo&, const LayoutPoint&) override; |
public: |
- virtual void paintObject(PaintInfo&, const LayoutPoint&) OVERRIDE; |
+ virtual void paintObject(PaintInfo&, const LayoutPoint&) override; |
virtual void paintChildren(PaintInfo&, const LayoutPoint&); |
// FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow |
@@ -289,15 +289,15 @@ public: |
protected: |
virtual void adjustInlineDirectionLineBounds(unsigned /* expansionOpportunityCount */, float& /* logicalLeft */, float& /* logicalWidth */) const { } |
- virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE; |
- virtual void computePreferredLogicalWidths() OVERRIDE; |
+ virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override; |
+ virtual void computePreferredLogicalWidths() override; |
void adjustIntrinsicLogicalWidthsForColumns(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const; |
- virtual int firstLineBoxBaseline() const OVERRIDE; |
- virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE; |
+ virtual int firstLineBoxBaseline() const override; |
+ virtual int inlineBlockBaseline(LineDirectionMode) const override; |
int lastLineBoxBaseline(LineDirectionMode) const; |
- virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) OVERRIDE; |
+ virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) override; |
// Delay update scrollbar until finishDelayUpdateScrollInfo() will be |
// called. This function is used when a flexbox is laying out its |
@@ -309,8 +309,8 @@ protected: |
void updateScrollInfoAfterLayout(); |
- 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; |
virtual bool hasLineIfEmpty() const; |
@@ -327,38 +327,38 @@ protected: |
void addOverflowFromBlockChildren(); |
void addVisualOverflowFromTheme(); |
- virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer) const OVERRIDE; |
+ virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer) const override; |
- virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const OVERRIDE; |
+ virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const override; |
void updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, RenderBox*); |
- virtual bool isInlineBlockOrInlineTable() const OVERRIDE FINAL { return isInline() && isReplaced(); } |
+ virtual bool isInlineBlockOrInlineTable() const override final { return isInline() && isReplaced(); } |
- virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) OVERRIDE; |
+ virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) override; |
private: |
- virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return children(); } |
- virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); } |
+ virtual RenderObjectChildList* virtualChildren() override final { return children(); } |
+ virtual const RenderObjectChildList* virtualChildren() const override final { return children(); } |
- virtual const char* renderName() const OVERRIDE; |
+ virtual const char* renderName() const override; |
- virtual bool isRenderBlock() const OVERRIDE FINAL { return true; } |
+ virtual bool isRenderBlock() const override final { return true; } |
void makeChildrenNonInline(RenderObject* insertionPoint = 0); |
virtual void removeLeftoverAnonymousBlock(RenderBlock* child); |
static void collapseAnonymousBlockChild(RenderBlock* parent, RenderBlock* child); |
- virtual void dirtyLinesFromChangedChild(RenderObject* child) OVERRIDE FINAL { m_lineBoxes.dirtyLinesFromChangedChild(this, child); } |
+ virtual void dirtyLinesFromChangedChild(RenderObject* child) override final { m_lineBoxes.dirtyLinesFromChangedChild(this, child); } |
void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChild); |
- virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild) OVERRIDE; |
+ virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild) override; |
void addChildToAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild); |
void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild = 0); |
- virtual bool isSelfCollapsingBlock() const OVERRIDE; |
+ virtual bool isSelfCollapsingBlock() const override; |
void insertIntoTrackedRendererMaps(RenderBox* descendant, TrackedDescendantsMap*&, TrackedContainerMap*&); |
static void removeFromTrackedRendererMaps(RenderBox* descendant, TrackedDescendantsMap*&, TrackedContainerMap*&); |
@@ -369,7 +369,7 @@ private: |
Node* nodeForHitTest() const; |
private: |
- virtual bool avoidsFloats() const OVERRIDE { return true; } |
+ virtual bool avoidsFloats() const override { return true; } |
bool hitTestColumns(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction); |
bool hitTestContents(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction); |
@@ -382,15 +382,15 @@ private: |
// Obtains the nearest enclosing block (including this block) that contributes a first-line style to our inline |
// children. |
- virtual RenderBlock* firstLineBlock() const OVERRIDE; |
+ virtual RenderBlock* firstLineBlock() const override; |
- virtual LayoutRect rectWithOutlineForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, LayoutUnit outlineWidth, const PaintInvalidationState* = 0) const OVERRIDE FINAL; |
+ virtual LayoutRect rectWithOutlineForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, LayoutUnit outlineWidth, const PaintInvalidationState* = 0) const override final; |
- virtual RenderObject* hoverAncestor() const OVERRIDE FINAL; |
- virtual void updateDragState(bool dragOn) OVERRIDE FINAL; |
- virtual void childBecameNonInline(RenderObject* child) OVERRIDE FINAL; |
+ virtual RenderObject* hoverAncestor() const override final; |
+ virtual void updateDragState(bool dragOn) override final; |
+ virtual void childBecameNonInline(RenderObject* child) override final; |
- virtual LayoutRect selectionRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer) const OVERRIDE FINAL |
+ virtual LayoutRect selectionRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer) const override final |
{ |
return selectionGapRectsForPaintInvalidation(paintInvalidationContainer); |
} |
@@ -403,13 +403,13 @@ private: |
// FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow |
virtual void clipOutFloatingObjects(const RenderBlock*, const PaintInfo*, const LayoutPoint&, const LayoutSize&) const { }; |
- virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const OVERRIDE; |
- virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const OVERRIDE; |
+ virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override; |
+ virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override; |
LayoutUnit desiredColumnWidth() const; |
private: |
- virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) OVERRIDE FINAL; |
+ virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) override final; |
void adjustPointToColumnContents(LayoutPoint&) const; |
@@ -469,7 +469,7 @@ protected: |
virtual bool canCollapseAnonymousBlockChild() const { return true; } |
public: |
- virtual LayoutUnit offsetFromLogicalTopOfFirstPage() const OVERRIDE FINAL; |
+ virtual LayoutUnit offsetFromLogicalTopOfFirstPage() const override final; |
protected: |
RenderObjectChildList m_children; |