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

Unified Diff: Source/core/layout/svg/LayoutSVGInline.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/LayoutSVGImage.h ('k') | Source/core/layout/svg/LayoutSVGInlineText.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/svg/LayoutSVGInline.h
diff --git a/Source/core/layout/svg/LayoutSVGInline.h b/Source/core/layout/svg/LayoutSVGInline.h
index 2bd5fcd20ceea6f02127dd55eac784c73885877d..95b528605f400e1d7d59183565d294db30fb1d31 100644
--- a/Source/core/layout/svg/LayoutSVGInline.h
+++ b/Source/core/layout/svg/LayoutSVGInline.h
@@ -29,34 +29,34 @@ class LayoutSVGInline : public LayoutInline {
public:
explicit LayoutSVGInline(Element*);
- virtual const char* name() const override { return "LayoutSVGInline"; }
- virtual DeprecatedPaintLayerType layerTypeRequired() const override final { return NoDeprecatedPaintLayer; }
- virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectSVG || type == LayoutObjectSVGInline || LayoutInline::isOfType(type); }
+ const char* name() const override { return "LayoutSVGInline"; }
+ DeprecatedPaintLayerType layerTypeRequired() const final { return NoDeprecatedPaintLayer; }
+ bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectSVG || type == LayoutObjectSVGInline || LayoutInline::isOfType(type); }
- virtual bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override;
+ bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override;
// Chapter 10.4 of the SVG Specification say that we should use the
// object bounding box of the parent text element.
// We search for the root text element and take its bounding box.
// It is also necessary to take the stroke and paint invalidation rect of
// this element, since we need it for filters.
- virtual FloatRect objectBoundingBox() const override final;
- virtual FloatRect strokeBoundingBox() const override final;
- virtual FloatRect paintInvalidationRectInLocalCoordinates() const override final;
+ FloatRect objectBoundingBox() const final;
+ FloatRect strokeBoundingBox() const final;
+ FloatRect paintInvalidationRectInLocalCoordinates() const final;
- virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = nullptr) const override final;
- 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 absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override final;
+ LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = nullptr) const final;
+ 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 absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const final;
private:
- virtual InlineFlowBox* createInlineFlowBox() override final;
+ InlineFlowBox* createInlineFlowBox() final;
- virtual void willBeDestroyed() override final;
- virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override final;
+ void willBeDestroyed() final;
+ void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) final;
- virtual void addChild(LayoutObject* child, LayoutObject* beforeChild = nullptr) override final;
- virtual void removeChild(LayoutObject*) override final;
+ void addChild(LayoutObject* child, LayoutObject* beforeChild = nullptr) final;
+ void removeChild(LayoutObject*) final;
};
DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutSVGInline, isSVGInline());
« no previous file with comments | « Source/core/layout/svg/LayoutSVGImage.h ('k') | Source/core/layout/svg/LayoutSVGInlineText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698