Fix virtual/override/final usage in Source/core/layout/.

Source/core/layout/LayoutBlockFlow.h

Index: Source/core/layout/LayoutBlockFlow.h
diff --git a/Source/core/layout/LayoutBlockFlow.h b/Source/core/layout/LayoutBlockFlow.h
index 49eb28d437052f5c3d0efa5ff2092a83af98e32f..b49777421dab66294cef0395d835bfde7c2b95f2 100644
--- a/Source/core/layout/LayoutBlockFlow.h
+++ b/Source/core/layout/LayoutBlockFlow.h
@@ -57,17 +57,17 @@ template <class Run> class BidiRunList;
 class CORE_EXPORT LayoutBlockFlow : public LayoutBlock {
 public:
     explicit LayoutBlockFlow(ContainerNode*);
-    virtual ~LayoutBlockFlow();
+    ~LayoutBlockFlow() override;
 
     static LayoutBlockFlow* createAnonymous(Document*);
 
-    virtual bool isLayoutBlockFlow() const override final { return true; }
+    bool isLayoutBlockFlow() const final { return true; }
 
-    virtual void layoutBlock(bool relayoutChildren) override;
+    void layoutBlock(bool relayoutChildren) override;
 
-    virtual void computeOverflow(LayoutUnit oldClientAfterEdge, bool recomputeFloats = false) override;
+    void computeOverflow(LayoutUnit oldClientAfterEdge, bool recomputeFloats = false) override;
 
-    virtual void deleteLineBoxTree() override final;
+    void deleteLineBoxTree() final;
 
     LayoutUnit availableLogicalWidthForLine(LayoutUnit position, bool shouldIndentText, LayoutUnit logicalHeight = 0) const
     {
@@ -100,8 +100,8 @@ public:
     using LayoutBlock::firstRootBox;
     using LayoutBlock::lastRootBox;
 
-    virtual LayoutUnit logicalLeftSelectionOffset(const LayoutBlock* rootBlock, LayoutUnit position) const override;
-    virtual LayoutUnit logicalRightSelectionOffset(const LayoutBlock* rootBlock, LayoutUnit position) const override;
+    LayoutUnit logicalLeftSelectionOffset(const LayoutBlock* rootBlock, LayoutUnit position) const override;
+    LayoutUnit logicalRightSelectionOffset(const LayoutBlock* rootBlock, LayoutUnit position) const override;
 
     RootInlineBox* createAndAppendRootInlineBox();
 
@@ -113,7 +113,7 @@ public:
 
     void removeFloatingObjects();
 
-    virtual void addChild(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) override;
+    void addChild(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) override;
 
     void moveAllChildrenIncludingFloatsTo(LayoutBlock* toBlock, bool fullRemoveInsert);
 
@@ -179,14 +179,14 @@ public:
     // FIXME: This should be const to avoid a const_cast, but can modify child dirty bits and LayoutTextCombine
     void computeInlinePreferredLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth);
 
-    virtual bool shouldPaintSelectionGaps() const override final;
+    bool shouldPaintSelectionGaps() const final;
     LayoutRect logicalLeftSelectionGap(const LayoutBlock* rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
         const LayoutObject* selObj, LayoutUnit logicalLeft, LayoutUnit logicalTop, LayoutUnit logicalHeight, const PaintInfo*) const;
     LayoutRect logicalRightSelectionGap(const LayoutBlock* rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
         const LayoutObject* selObj, LayoutUnit logicalRight, LayoutUnit logicalTop, LayoutUnit logicalHeight, const PaintInfo*) const;
     void getSelectionGapInfo(SelectionState, bool& leftGap, bool& rightGap) const;
 
-    virtual LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer) const override final;
+    LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer) const final;
     GapRects selectionGapRectsForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer) const;
     GapRects selectionGaps(const LayoutBlock* rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
         LayoutUnit& lastLogicalTop, LayoutUnit& lastLogicalLeft, LayoutUnit& lastLogicalRight,
@@ -203,10 +203,10 @@ public:
 
     void positionSpannerDescendant(LayoutMultiColumnSpannerPlaceholder& child);
 
-    virtual bool avoidsFloats() const override;
+    bool avoidsFloats() const override;
 
     using LayoutBoxModelObject::moveChildrenTo;
-    virtual void moveChildrenTo(LayoutBoxModelObject* toBoxModelObject, LayoutObject* startChild, LayoutObject* endChild, LayoutObject* beforeChild, bool fullRemoveInsert = false) override;
+    void moveChildrenTo(LayoutBoxModelObject* toBoxModelObject, LayoutObject* startChild, LayoutObject* endChild, LayoutObject* beforeChild, bool fullRemoveInsert = false) override;
 
     LayoutUnit xPositionForFloatIncludingMargin(const FloatingObject& child) const
     {
@@ -237,7 +237,7 @@ public:
 
     LayoutPoint flipFloatForWritingModeForChild(const FloatingObject&, const LayoutPoint&) const;
 
-    virtual const char* name() const override { return "LayoutBlockFlow"; }
+    const char* name() const override { return "LayoutBlockFlow"; }
 
     FloatingObject* insertFloatingObject(LayoutBox&);
 
@@ -261,8 +261,8 @@ protected:
 
     void createFloatingObjects();
 
-    virtual void styleWillChange(StyleDifference, const ComputedStyle& newStyle) override;
-    virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
+    void styleWillChange(StyleDifference, const ComputedStyle& newStyle) override;
+    void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
 
     void updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, LayoutBox&);
 
@@ -278,7 +278,7 @@ protected:
     }
 
     virtual LayoutObject* layoutSpecialExcludedChild(bool /*relayoutChildren*/, SubtreeLayoutScope&);
-    virtual bool updateLogicalWidthAndColumnWidth() override;
+    bool updateLogicalWidthAndColumnWidth() override;
 
     void setLogicalLeftForChild(LayoutBox& child, LayoutUnit logicalLeft);
     void setLogicalTopForChild(LayoutBox& child, LayoutUnit logicalTop);
@@ -306,12 +306,12 @@ private:
 
     LayoutUnit lowestFloatLogicalBottom(FloatingObject::Type = FloatingObject::FloatLeftRight) const;
 
-    virtual bool hitTestFloats(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset) override final;
+    bool hitTestFloats(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset) final;
 
-    virtual void invalidatePaintForOverhangingFloats(bool paintAllDescendants) override final;
-    virtual void invalidatePaintForOverflow() override final;
-    virtual void paintFloats(const PaintInfo&, const LayoutPoint&, bool preservePhase = false) override final;
-    virtual void paintSelection(const PaintInfo&, const LayoutPoint&) override final;
+    void invalidatePaintForOverhangingFloats(bool paintAllDescendants) final;
+    void invalidatePaintForOverflow() final;
+    void paintFloats(const PaintInfo&, const LayoutPoint&, bool preservePhase = false) final;
+    void paintSelection(const PaintInfo&, const LayoutPoint&) final;
     virtual void clipOutFloatingObjects(const LayoutBlock*, ClipScope&, const LayoutPoint&, const LayoutSize&) const;
     void clearFloats(EClear);
 
@@ -472,8 +472,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(); }
+    LayoutUnit collapsedMarginBefore() const final { return maxPositiveMarginBefore() - maxNegativeMarginBefore(); }
+    LayoutUnit collapsedMarginAfter() const final { return maxPositiveMarginAfter() - maxNegativeMarginAfter(); }
 
     LayoutUnit collapseMargins(LayoutBox& child, MarginInfo&, bool childIsSelfCollapsing);
     LayoutUnit clearFloatsIfNeeded(LayoutBox& child, MarginInfo&, LayoutUnit oldTopPosMargin, LayoutUnit oldTopNegMargin, LayoutUnit yPos, bool childIsSelfCollapsing);
@@ -499,7 +499,7 @@ private:
     LayoutUnit m_paintInvalidationLogicalTop;
     LayoutUnit m_paintInvalidationLogicalBottom;
 
-    virtual bool isSelfCollapsingBlock() const override;
+    bool isSelfCollapsingBlock() const override;
 
 protected:
     OwnPtr<LayoutBlockFlowRareData> m_rareData;