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

Source/core/layout/LayoutView.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 31 matching lines @@
 class DeprecatedPaintLayerCompositor;
 class LayoutQuote;
 
 // The root of the layout tree, corresponding to the CSS initial containing block.
 // It's dimensions match that of the logical viewport (which may be different from
 // the visible viewport in fixed-layout mode), and it is always at position (0,0)
 // relative to the document (and so isn't necessarily in view).
 class CORE_EXPORT LayoutView final : public LayoutBlockFlow {
 public:
     explicit LayoutView(Document*);
-    virtual ~LayoutView();
+    ~LayoutView() override;
     void willBeDestroyed() override;
 
     // hitTest() will update layout, style and compositing first while hitTestNoLifecycleUpdate() does not.
     bool hitTest(HitTestResult&);
     bool hitTestNoLifecycleUpdate(HitTestResult&);
 
     // Returns the total count of calls to HitTest, for testing.
     unsigned hitTestCount() const { return m_hitTestCount; }
     unsigned hitTestCacheHits() const { return m_hitTestCacheHits; }
 
     void clearHitTestCache() { m_hitTestCache->clear(); }
 
-    virtual const char* name() const override { return "LayoutView"; }
+    const char* name() const override { return "LayoutView"; }
 
-    virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutView || LayoutBlockFlow::isOfType(type); }
+    bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutView || LayoutBlockFlow::isOfType(type); }
 
-    virtual DeprecatedPaintLayerType layerTypeRequired() const override { return NormalDeprecatedPaintLayer; }
+    DeprecatedPaintLayerType layerTypeRequired() const override { return NormalDeprecatedPaintLayer; }
 
-    virtual bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override;
+    bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override;
 
-    virtual void layout() override;
-    virtual void updateLogicalWidth() override;
-    virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
+    void layout() override;
+    void updateLogicalWidth() override;
+    void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
 
     // Based on FrameView::layoutSize, but:
     // - checks for null FrameView
     // - returns 0x0 if using printing layout
     // - scrollbar exclusion is compatible with root layer scrolling
     IntSize layoutSize(IncludeScrollbarsInRect = ExcludeScrollbars) const;
 
     int viewHeight(IncludeScrollbarsInRect scrollbarInclusion = ExcludeScrollbars) const { return layoutSize(scrollbarInclusion).height(); }
     int viewWidth(IncludeScrollbarsInRect scrollbarInclusion = ExcludeScrollbars) const { return layoutSize(scrollbarInclusion).width(); }
 
     int viewLogicalWidth(IncludeScrollbarsInRect = ExcludeScrollbars) const;
     int viewLogicalHeight(IncludeScrollbarsInRect = ExcludeScrollbars) const;
 
     LayoutUnit viewLogicalHeightForPercentages() const;
 
     float zoomFactor() const;
 
     FrameView* frameView() const { return m_frameView; }
 
     enum ViewportConstrainedPosition {
         IsNotFixedPosition,
         IsFixedPosition,
     };
 
     static ViewportConstrainedPosition viewportConstrainedPosition(EPosition position) { return position == FixedPosition ? IsFixedPosition : IsNotFixedPosition; }
     void mapRectToPaintInvalidationBacking(const LayoutBoxModelObject* paintInvalidationContainer, LayoutRect&, ViewportConstrainedPosition, const PaintInvalidationState*) const;
-    virtual void mapRectToPaintInvalidationBacking(const LayoutBoxModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const override;
+    void mapRectToPaintInvalidationBacking(const LayoutBoxModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const override;
     void adjustViewportConstrainedOffset(LayoutRect&, ViewportConstrainedPosition) const;
 
     void invalidatePaintForRectangle(const LayoutRect&, PaintInvalidationReason) const;
 
     void invalidatePaintForViewAndCompositedLayers();
 
-    virtual void paint(const PaintInfo&, const LayoutPoint&) override;
-    virtual void paintBoxDecorationBackground(const PaintInfo&, const LayoutPoint&) override;
+    void paint(const PaintInfo&, const LayoutPoint&) override;
+    void paintBoxDecorationBackground(const PaintInfo&, const LayoutPoint&) override;
 
     enum SelectionPaintInvalidationMode { PaintInvalidationNewXOROld, PaintInvalidationNewMinusOld };
     void setSelection(LayoutObject* start, int startPos, LayoutObject*, int endPos, SelectionPaintInvalidationMode = PaintInvalidationNewXOROld);
     void clearSelection();
     void setSelection(const FrameSelection&);
     bool hasPendingSelection() const { return m_pendingSelection->hasPendingSelection(); }
     void commitPendingSelection();
     LayoutObject* selectionStart();
     LayoutObject* selectionEnd();
     IntRect selectionBounds();
     void selectionStartEnd(int& startPos, int& endPos);
     void invalidatePaintForSelection();
 
-    virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override;
-    virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override;
+    void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override;
+    void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override;
 
-    virtual LayoutRect viewRect() const override;
+    LayoutRect viewRect() const override;
 
     bool shouldDoFullPaintInvalidationForNextLayout() const;
     bool doingFullPaintInvalidation() const { return m_frameView->needsFullPaintInvalidation(); }
 
     LayoutState* layoutState() const { return m_layoutState; }
 
-    virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) override;
+    void updateHitTestResult(HitTestResult&, const LayoutPoint&) override;
 
     LayoutUnit pageLogicalHeight() const { return m_pageLogicalHeight; }
     void setPageLogicalHeight(LayoutUnit height)
     {
         if (m_pageLogicalHeight != height) {
             m_pageLogicalHeight = height;
             m_pageLogicalHeightChanged = true;
         }
     }
     bool pageLogicalHeightChanged() const { return m_pageLogicalHeightChanged; }
@@ skipping 20 matching lines @@
     LayoutQuote* layoutQuoteHead() const { return m_layoutQuoteHead; }
 
     // FIXME: This is a work around because the current implementation of counters
     // requires walking the entire tree repeatedly and most pages don't actually use either
     // feature so we shouldn't take the performance hit when not needed. Long term we should
     // rewrite the counter and quotes code.
     void addLayoutCounter() { m_layoutCounterCount++; }
     void removeLayoutCounter() { ASSERT(m_layoutCounterCount > 0); m_layoutCounterCount--; }
     bool hasLayoutCounters() { return m_layoutCounterCount; }
 
-    virtual bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const override;
+    bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const override;
 
     double layoutViewportWidth() const;
     double layoutViewportHeight() const;
 
     void pushLayoutState(LayoutState& layoutState) { m_layoutState = &layoutState; }
     void popLayoutState() { ASSERT(m_layoutState); m_layoutState = m_layoutState->next(); }
-    virtual void invalidateTreeIfNeeded(PaintInvalidationState&) override final;
+    void invalidateTreeIfNeeded(PaintInvalidationState&) final;
 
-    virtual LayoutRect visualOverflowRect() const override;
+    LayoutRect visualOverflowRect() const override;
 
     // Invalidates paint for the entire view, including composited descendants, but not including child frames.
     // It is very likely you do not want to call this method.
     void setShouldDoFullPaintInvalidationForViewAndAllDescendants();
 
 private:
-    virtual void mapLocalToContainer(const LayoutBoxModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = nullptr, const PaintInvalidationState* = nullptr) const override;
+    void mapLocalToContainer(const LayoutBoxModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = nullptr, const PaintInvalidationState* = nullptr) const override;
 
     template <typename Strategy>
     void commitPendingSelectionAlgorithm();
 
-    virtual const LayoutObject* pushMappingToContainer(const LayoutBoxModelObject* ancestorToStopAt, LayoutGeometryMap&) const override;
-    virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const override;
-    virtual void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const override;
+    const LayoutObject* pushMappingToContainer(const LayoutBoxModelObject* ancestorToStopAt, LayoutGeometryMap&) const override;
+    void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const override;
+    void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const override;
 
     void layoutContent();
 #if ENABLE(ASSERT)
     void checkLayoutState();
 #endif
 
     friend class ForceHorriblySlowRectMapping;
 
     bool shouldUsePrintingLayout() const;
 
@@ skipping 48 matching lines @@
             m_paintInvalidationState->m_cachedOffsetsEnabled = true;
     }
 private:
     const PaintInvalidationState* m_paintInvalidationState;
     bool m_didDisable;
 };
 
 } // namespace blink
 
 #endif // LayoutView_h