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

Unified Diff: Source/core/rendering/svg/RenderSVGModelObject.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch Created 6 years, 2 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/rendering/svg/RenderSVGInlineText.h ('k') | Source/core/rendering/svg/RenderSVGPath.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/svg/RenderSVGModelObject.h
diff --git a/Source/core/rendering/svg/RenderSVGModelObject.h b/Source/core/rendering/svg/RenderSVGModelObject.h
index 67a3e5db060ae33ac2744140b531ea3a23e05967..688ec365618e4d8eed239295b41fcb439879bce8 100644
--- a/Source/core/rendering/svg/RenderSVGModelObject.h
+++ b/Source/core/rendering/svg/RenderSVGModelObject.h
@@ -45,38 +45,38 @@ class RenderSVGModelObject : public RenderObject {
public:
explicit RenderSVGModelObject(SVGElement*);
- virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE;
- virtual bool canHaveWhitespaceChildren() const OVERRIDE { return false; }
+ virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override;
+ virtual bool canHaveWhitespaceChildren() const override { return false; }
- virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const OVERRIDE;
- virtual void computeFloatRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, FloatRect&, const PaintInvalidationState*) const OVERRIDE FINAL;
+ virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override;
+ virtual void computeFloatRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, FloatRect&, const PaintInvalidationState*) const override final;
- virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const OVERRIDE FINAL;
- virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const OVERRIDE;
+ virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override final;
+ virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override;
- virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const OVERRIDE FINAL;
- virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE FINAL;
- virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
+ virtual void mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const override final;
+ virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override final;
+ virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
- virtual void computeLayerHitTestRects(LayerHitTestRects&) const OVERRIDE FINAL;
+ virtual void computeLayerHitTestRects(LayerHitTestRects&) const override final;
SVGElement* element() const { return toSVGElement(RenderObject::node()); }
- virtual bool isSVG() const OVERRIDE FINAL { return true; }
+ virtual bool isSVG() const override final { return true; }
protected:
- virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer* currentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const OVERRIDE FINAL;
- virtual void willBeDestroyed() OVERRIDE;
+ virtual void addLayerHitTestRects(LayerHitTestRects&, const RenderLayer* currentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const override final;
+ virtual void willBeDestroyed() override;
private:
// RenderSVGModelObject subclasses should use element() instead.
void node() const WTF_DELETED_FUNCTION;
// This method should never be called, SVG uses a different nodeAtPoint method
- virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE FINAL;
- virtual void absoluteFocusRingQuads(Vector<FloatQuad>&) OVERRIDE FINAL;
+ virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override final;
+ virtual void absoluteFocusRingQuads(Vector<FloatQuad>&) override final;
- virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) OVERRIDE FINAL;
+ virtual void invalidateTreeIfNeeded(const PaintInvalidationState&) override final;
};
}
« no previous file with comments | « Source/core/rendering/svg/RenderSVGInlineText.h ('k') | Source/core/rendering/svg/RenderSVGPath.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698