Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(848)

Unified Diff: Source/core/layout/svg/LayoutSVGModelObject.h

Issue 1231363003: Fix virtual/override/final usage in Source/core/layout/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/svg/LayoutSVGInlineText.h ('k') | Source/core/layout/svg/LayoutSVGPath.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/svg/LayoutSVGModelObject.h
diff --git a/Source/core/layout/svg/LayoutSVGModelObject.h b/Source/core/layout/svg/LayoutSVGModelObject.h
index 5cdac3ad7cd0271d1ee710f50ae0484592961e31..91f49df1e0e28d1111e938c8b07615f7ae2535c5 100644
--- a/Source/core/layout/svg/LayoutSVGModelObject.h
+++ b/Source/core/layout/svg/LayoutSVGModelObject.h
@@ -45,38 +45,38 @@ class LayoutSVGModelObject : public LayoutObject {
public:
explicit LayoutSVGModelObject(SVGElement*);
- virtual bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override;
+ bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override;
- virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = nullptr) const override;
+ LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = nullptr) const override;
- virtual FloatRect paintInvalidationRectInLocalCoordinates() const override final { return m_paintInvalidationBoundingBox; }
+ FloatRect paintInvalidationRectInLocalCoordinates() const final { return m_paintInvalidationBoundingBox; }
- virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override final;
- virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override;
+ void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const final;
+ void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override;
- virtual void mapLocalToContainer(const LayoutBoxModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = nullptr, const PaintInvalidationState* = nullptr) const override final;
- virtual const LayoutObject* pushMappingToContainer(const LayoutBoxModelObject* ancestorToStopAt, LayoutGeometryMap&) const override final;
- virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
+ void mapLocalToContainer(const LayoutBoxModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = nullptr, const PaintInvalidationState* = nullptr) const final;
+ const LayoutObject* pushMappingToContainer(const LayoutBoxModelObject* ancestorToStopAt, LayoutGeometryMap&) const final;
+ void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
- virtual void computeLayerHitTestRects(LayerHitTestRects&) const override final;
+ void computeLayerHitTestRects(LayerHitTestRects&) const final;
SVGElement* element() const { return toSVGElement(LayoutObject::node()); }
- virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectSVG || LayoutObject::isOfType(type); }
+ bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectSVG || LayoutObject::isOfType(type); }
protected:
- virtual void addLayerHitTestRects(LayerHitTestRects&, const DeprecatedPaintLayer* currentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const override final;
- virtual void willBeDestroyed() override;
+ void addLayerHitTestRects(LayerHitTestRects&, const DeprecatedPaintLayer* currentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const final;
+ void willBeDestroyed() override;
private:
// LayoutSVGModelObject subclasses should use element() instead.
void node() const = delete;
// This method should never be called, SVG uses a different nodeAtPoint method
- virtual bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override final;
- virtual IntRect absoluteFocusRingBoundingBoxRect() const override final;
+ bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) final;
+ IntRect absoluteFocusRingBoundingBoxRect() const final;
- virtual void invalidateTreeIfNeeded(PaintInvalidationState&) override final;
+ void invalidateTreeIfNeeded(PaintInvalidationState&) final;
protected:
FloatRect m_paintInvalidationBoundingBox;
« no previous file with comments | « Source/core/layout/svg/LayoutSVGInlineText.h ('k') | Source/core/layout/svg/LayoutSVGPath.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698