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

Source/core/layout/LayoutTable.h

 /*
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 26 matching lines @@
 class LayoutTableCaption;
 class LayoutTableCell;
 class LayoutTableSection;
 class TableLayoutAlgorithm;
 
 enum SkipEmptySectionsValue { DoNotSkipEmptySections, SkipEmptySections };
 
 class CORE_EXPORT LayoutTable final : public LayoutBlock {
 public:
     explicit LayoutTable(Element*);
-    virtual ~LayoutTable();
+    ~LayoutTable() override;
 
     // Per CSS 3 writing-mode: "The first and second values of the 'border-spacing' property represent spacing between columns
     // and rows respectively, not necessarily the horizontal and vertical spacing respectively".
     int hBorderSpacing() const { return m_hSpacing; }
     int vBorderSpacing() const { return m_vSpacing; }
 
     bool collapseBorders() const { return style()->borderCollapse(); }
 
-    virtual int borderStart() const override { return m_borderStart; }
-    virtual int borderEnd() const override { return m_borderEnd; }
-    virtual int borderBefore() const override;
-    virtual int borderAfter() const override;
+    int borderStart() const override { return m_borderStart; }
+    int borderEnd() const override { return m_borderEnd; }
+    int borderBefore() const override;
+    int borderAfter() const override;
 
-    virtual int borderLeft() const override
+    int borderLeft() const override
     {
         if (style()->isHorizontalWritingMode())
             return style()->isLeftToRightDirection() ? borderStart() : borderEnd();
         return style()->isFlippedBlocksWritingMode() ? borderAfter() : borderBefore();
     }
 
-    virtual int borderRight() const override
+    int borderRight() const override
     {
         if (style()->isHorizontalWritingMode())
             return style()->isLeftToRightDirection() ? borderEnd() : borderStart();
         return style()->isFlippedBlocksWritingMode() ? borderBefore() : borderAfter();
     }
 
-    virtual int borderTop() const override
+    int borderTop() const override
     {
         if (style()->isHorizontalWritingMode())
             return style()->isFlippedBlocksWritingMode() ? borderAfter() : borderBefore();
         return style()->isLeftToRightDirection() ? borderStart() : borderEnd();
     }
 
-    virtual int borderBottom() const override
+    int borderBottom() const override
     {
         if (style()->isHorizontalWritingMode())
             return style()->isFlippedBlocksWritingMode() ? borderBefore() : borderAfter();
         return style()->isLeftToRightDirection() ? borderEnd() : borderStart();
     }
 
     int outerBorderBefore() const;
     int outerBorderAfter() const;
     int outerBorderStart() const;
     int outerBorderEnd() const;
@@ skipping 23 matching lines @@
     {
         if (style()->isHorizontalWritingMode())
             return style()->isFlippedBlocksWritingMode() ? outerBorderBefore() : outerBorderAfter();
         return style()->isLeftToRightDirection() ? outerBorderEnd() : outerBorderStart();
     }
 
     int calcBorderStart() const;
     int calcBorderEnd() const;
     void recalcBordersInRowDirection();
 
-    virtual void addChild(LayoutObject* child, LayoutObject* beforeChild = nullptr) override;
-    virtual void addChildIgnoringContinuation(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) override;
+    void addChild(LayoutObject* child, LayoutObject* beforeChild = nullptr) override;
+    void addChildIgnoringContinuation(LayoutObject* newChild, LayoutObject* beforeChild = nullptr) override;
 
     struct ColumnStruct {
         explicit ColumnStruct(unsigned initialSpan = 1)
             : span(initialSpan)
         {
         }
 
         unsigned span;
     };
 
@@ skipping 56 matching lines @@
 
     LayoutUnit borderSpacingInRowDirection() const
     {
         if (unsigned effectiveColumnCount = numEffCols())
             return static_cast<LayoutUnit>(effectiveColumnCount + 1) * hBorderSpacing();
 
         return 0;
     }
 
     // Override paddingStart/End to return pixel values to match behavor of LayoutTableCell.
-    virtual LayoutUnit paddingEnd() const override { return static_cast<int>(LayoutBlock::paddingEnd()); }
-    virtual LayoutUnit paddingStart() const override { return static_cast<int>(LayoutBlock::paddingStart()); }
+    LayoutUnit paddingEnd() const override { return static_cast<int>(LayoutBlock::paddingEnd()); }
+    LayoutUnit paddingStart() const override { return static_cast<int>(LayoutBlock::paddingStart()); }
 
     LayoutUnit bordersPaddingAndSpacingInRowDirection() const
     {
         // 'border-spacing' only applies to separate borders (see 17.6.1 The separated borders model).
         return borderStart() + borderEnd() + (collapseBorders() ? LayoutUnit() : (paddingStart() + paddingEnd() + borderSpacingInRowDirection()));
     }
 
     // Return the first column or column-group.
     LayoutTableCol* firstColumn() const;
 
@@ skipping 31 matching lines @@
 
     bool hasSections() const { return m_head || m_foot || m_firstBody; }
 
     void recalcSectionsIfNeeded() const
     {
         if (m_needsSectionRecalc)
             recalcSections();
     }
 
     static LayoutTable* createAnonymousWithParent(const LayoutObject*);
-    virtual LayoutBox* createAnonymousBoxWithSameTypeAs(const LayoutObject* parent) const override
+    LayoutBox* createAnonymousBoxWithSameTypeAs(const LayoutObject* parent) const override
     {
         return createAnonymousWithParent(parent);
     }
 
     const BorderValue& tableStartBorderAdjoiningCell(const LayoutTableCell*) const;
     const BorderValue& tableEndBorderAdjoiningCell(const LayoutTableCell*) const;
 
     void addCaption(const LayoutTableCaption*);
     void removeCaption(const LayoutTableCaption*);
     void addColumn(const LayoutTableCol*);
     void removeColumn(const LayoutTableCol*);
 
-    virtual void paintBoxDecorationBackground(const PaintInfo&, const LayoutPoint&) override final;
+    void paintBoxDecorationBackground(const PaintInfo&, const LayoutPoint&) final;
 
-    virtual void paintMask(const PaintInfo&, const LayoutPoint&) override final;
+    void paintMask(const PaintInfo&, const LayoutPoint&) final;
 
     const CollapsedBorderValues& collapsedBorders()
     {
         ASSERT(m_collapsedBordersValid);
         return m_collapsedBorders;
     }
 
     void subtractCaptionRect(LayoutRect&) const;
 
-    virtual const char* name() const override { return "LayoutTable"; }
+    const char* name() const override { return "LayoutTable"; }
 
 protected:
-    virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
-    virtual void simplifiedNormalFlowLayout() override;
-    virtual PaintInvalidationReason invalidatePaintIfNeeded(PaintInvalidationState&, const LayoutBoxModelObject& paintInvalidationContainer) override;
-    virtual void invalidatePaintOfSubtreesIfNeeded(PaintInvalidationState&) override;
+    void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
+    void simplifiedNormalFlowLayout() override;
+    PaintInvalidationReason invalidatePaintIfNeeded(PaintInvalidationState&, const LayoutBoxModelObject& paintInvalidationContainer) override;
+    void invalidatePaintOfSubtreesIfNeeded(PaintInvalidationState&) override;
 
 private:
-    virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectTable || LayoutBlock::isOfType(type); }
+    bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectTable || LayoutBlock::isOfType(type); }
 
-    virtual void paintObject(const PaintInfo&, const LayoutPoint&) override;
-    virtual void layout() override;
-    virtual void computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) const override;
-    virtual void computePreferredLogicalWidths() override;
-    virtual bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
+    void paintObject(const PaintInfo&, const LayoutPoint&) override;
+    void layout() override;
+    void computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) const override;
+    void computePreferredLogicalWidths() override;
+    bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
 
-    virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
-    virtual int firstLineBoxBaseline() const override;
-    virtual int inlineBlockBaseline(LineDirectionMode) const override;
+    int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
+    int firstLineBoxBaseline() const override;
+    int inlineBlockBaseline(LineDirectionMode) const override;
 
     LayoutTableCol* slowColElement(unsigned col, bool* startEdge, bool* endEdge) const;
 
     void updateColumnCache() const;
     void invalidateCachedColumns();
 
-    virtual void updateLogicalWidth() override;
+    void updateLogicalWidth() override;
 
     LayoutUnit convertStyleLogicalWidthToComputedWidth(const Length& styleLogicalWidth, LayoutUnit availableWidth);
     LayoutUnit convertStyleLogicalHeightToComputedHeight(const Length& styleLogicalHeight);
 
-    virtual LayoutRect overflowClipRect(const LayoutPoint& location, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize) const override;
+    LayoutRect overflowClipRect(const LayoutPoint& location, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize) const override;
 
-    virtual void addOverflowFromChildren() override;
+    void addOverflowFromChildren() override;
 
     void recalcSections() const;
     void layoutCaption(LayoutTableCaption&);
 
     void distributeExtraLogicalHeight(int extraLogicalHeight);
 
     void recalcCollapsedBordersIfNeeded();
 
     mutable Vector<int> m_columnPos;
     mutable Vector<ColumnStruct> m_columns;
@@ skipping 40 matching lines @@
     if (m_firstBody)
         return m_firstBody;
     return m_foot;
 }
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutTable, isTable());
 
 } // namespace blink
 
 #endif // LayoutTable_h