| Index: Source/core/rendering/RenderBlock.h
|
| diff --git a/Source/core/rendering/RenderBlock.h b/Source/core/rendering/RenderBlock.h
|
| index aaa309d9309bf65287db7f77a74af0ed3d0155e6..2527bb106a17cc92bd2e8c52a4925129f74f845e 100644
|
| --- a/Source/core/rendering/RenderBlock.h
|
| +++ b/Source/core/rendering/RenderBlock.h
|
| @@ -102,7 +102,7 @@ public:
|
| bool beingDestroyed() const { return m_beingDestroyed; }
|
|
|
| // These two functions are overridden for inline-block.
|
| - virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
|
| + virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL;
|
| virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
|
|
|
| RenderLineBoxList* lineBoxes() { return &m_lineBoxes; }
|
| @@ -158,7 +158,7 @@ public:
|
| void markAllDescendantsWithFloatsForLayout(RenderBox* floatToRemove = 0, bool inLayout = true);
|
| void markSiblingsWithFloatsForLayout(RenderBox* floatToRemove = 0);
|
| void markPositionedObjectsForLayout();
|
| - virtual void markForPaginationRelayoutIfNeeded();
|
| + virtual void markForPaginationRelayoutIfNeeded() OVERRIDE FINAL;
|
|
|
| bool containsFloats() const { return m_floatingObjects && !m_floatingObjects->set().isEmpty(); }
|
| bool containsFloat(RenderBox*) const;
|
| @@ -230,7 +230,7 @@ public:
|
| virtual VisiblePosition positionForPoint(const LayoutPoint&);
|
|
|
| // Block flows subclass availableWidth to handle multi column layout (shrinking the width available to children when laying out.)
|
| - virtual LayoutUnit availableLogicalWidth() const;
|
| + virtual LayoutUnit availableLogicalWidth() const OVERRIDE FINAL;
|
|
|
| LayoutPoint flipForWritingModeIncludingColumns(const LayoutPoint&) const;
|
| void adjustStartEdgeForWritingModeIncludingColumns(LayoutRect&) const;
|
| @@ -257,13 +257,13 @@ public:
|
| void clearTruncation();
|
|
|
| void adjustRectForColumns(LayoutRect&) const;
|
| - virtual void adjustForColumns(LayoutSize&, const LayoutPoint&) const;
|
| + virtual void adjustForColumns(LayoutSize&, const LayoutPoint&) const OVERRIDE FINAL;
|
| void adjustForColumnRect(LayoutSize& offset, const LayoutPoint& locationInContainer) const;
|
|
|
| void addContinuationWithOutline(RenderInline*);
|
| bool paintsContinuationOutline(RenderInline*);
|
|
|
| - virtual RenderBoxModelObject* virtualContinuation() const { return continuation(); }
|
| + virtual RenderBoxModelObject* virtualContinuation() const OVERRIDE FINAL { return continuation(); }
|
| bool isAnonymousBlockContinuation() const { return continuation() && isAnonymousBlock(); }
|
| RenderInline* inlineElementContinuation() const;
|
| RenderBlock* blockElementContinuation() const;
|
| @@ -586,34 +586,34 @@ private:
|
| void computeExclusionShapeSize();
|
| void updateExclusionShapeInsideInfoAfterStyleChange(const ExclusionShapeValue*, const ExclusionShapeValue* oldExclusionShape);
|
| #endif
|
| - virtual RenderObjectChildList* virtualChildren() { return children(); }
|
| - virtual const RenderObjectChildList* virtualChildren() const { return children(); }
|
| + virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return children(); }
|
| + virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); }
|
|
|
| virtual const char* renderName() const;
|
|
|
| - virtual bool isRenderBlock() const { return true; }
|
| - virtual bool isBlockFlow() const { return (!isInline() || isReplaced()) && !isTable(); }
|
| - virtual bool isInlineBlockOrInlineTable() const { return isInline() && isReplaced(); }
|
| + virtual bool isRenderBlock() const OVERRIDE FINAL { return true; }
|
| + virtual bool isBlockFlow() const OVERRIDE FINAL { return (!isInline() || isReplaced()) && !isTable(); }
|
| + virtual bool isInlineBlockOrInlineTable() const OVERRIDE FINAL { return isInline() && isReplaced(); }
|
|
|
| void makeChildrenNonInline(RenderObject* insertionPoint = 0);
|
| virtual void removeLeftoverAnonymousBlock(RenderBlock* child);
|
|
|
| static void collapseAnonymousBoxChild(RenderBlock* parent, RenderObject* child);
|
|
|
| - virtual void dirtyLinesFromChangedChild(RenderObject* child) { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }
|
| + virtual void dirtyLinesFromChangedChild(RenderObject* child) OVERRIDE FINAL { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }
|
|
|
| void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChild);
|
| void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild);
|
| void addChildToAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild);
|
|
|
| - virtual void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild = 0);
|
| + void addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild, RenderObject* beforeChild = 0);
|
|
|
| - virtual bool isSelfCollapsingBlock() const;
|
| + virtual bool isSelfCollapsingBlock() const OVERRIDE FINAL;
|
|
|
| - virtual LayoutUnit collapsedMarginBefore() const { return maxPositiveMarginBefore() - maxNegativeMarginBefore(); }
|
| - virtual LayoutUnit collapsedMarginAfter() const { return maxPositiveMarginAfter() - maxNegativeMarginAfter(); }
|
| + virtual LayoutUnit collapsedMarginBefore() const OVERRIDE FINAL { return maxPositiveMarginBefore() - maxNegativeMarginBefore(); }
|
| + virtual LayoutUnit collapsedMarginAfter() const OVERRIDE FINAL { return maxPositiveMarginAfter() - maxNegativeMarginAfter(); }
|
|
|
| - virtual void repaintOverhangingFloats(bool paintAllDescendants) OVERRIDE;
|
| + virtual void repaintOverhangingFloats(bool paintAllDescendants) OVERRIDE FINAL;
|
|
|
| void layoutBlockChildren(bool relayoutChildren, LayoutUnit& maxFloatLogicalBottom);
|
| void layoutInlineChildren(bool relayoutChildren, LayoutUnit& repaintLogicalTop, LayoutUnit& repaintLogicalBottom);
|
| @@ -894,8 +894,8 @@ private:
|
| LayoutUnit lowestFloatLogicalBottom(FloatingObject::Type = FloatingObject::FloatLeftRight) const;
|
| LayoutUnit nextFloatLogicalBottomBelow(LayoutUnit) const;
|
|
|
| - virtual bool hitTestColumns(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
|
| - virtual bool hitTestContents(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
|
| + bool hitTestColumns(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
|
| + bool hitTestContents(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
|
| bool hitTestFloats(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset);
|
|
|
| virtual bool isPointInOverflowControl(HitTestResult&, const LayoutPoint& locationInContainer, const LayoutPoint& accumulatedOffset);
|
| @@ -908,18 +908,18 @@ private:
|
| // children.
|
| virtual RenderBlock* firstLineBlock() const;
|
|
|
| - virtual LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const OVERRIDE;
|
| - virtual RenderStyle* outlineStyleForRepaint() const;
|
| + virtual LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const OVERRIDE FINAL;
|
| + virtual RenderStyle* outlineStyleForRepaint() const OVERRIDE FINAL;
|
|
|
| - virtual RenderObject* hoverAncestor() const;
|
| - virtual void updateDragState(bool dragOn);
|
| - virtual void childBecameNonInline(RenderObject* child);
|
| + virtual RenderObject* hoverAncestor() const OVERRIDE FINAL;
|
| + virtual void updateDragState(bool dragOn) OVERRIDE FINAL;
|
| + virtual void childBecameNonInline(RenderObject* child) OVERRIDE FINAL;
|
|
|
| - virtual LayoutRect selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool /*clipToVisibleContent*/) OVERRIDE
|
| + virtual LayoutRect selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool /*clipToVisibleContent*/) OVERRIDE FINAL
|
| {
|
| return selectionGapRectsForRepaint(repaintContainer);
|
| }
|
| - virtual bool shouldPaintSelectionGaps() const;
|
| + virtual bool shouldPaintSelectionGaps() const OVERRIDE FINAL;
|
| bool isSelectionRoot() const;
|
| GapRects selectionGaps(RenderBlock* rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
|
| LayoutUnit& lastLogicalTop, LayoutUnit& lastLogicalLeft, LayoutUnit& lastLogicalRight, const PaintInfo* = 0);
|
| @@ -940,7 +940,7 @@ private:
|
|
|
| void paintContinuationOutlines(PaintInfo&, const LayoutPoint&);
|
|
|
| - virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0);
|
| + virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) OVERRIDE FINAL;
|
|
|
| void adjustPointToColumnContents(LayoutPoint&) const;
|
|
|
|
|