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

Unified Diff: Source/core/rendering/svg/RenderSVGShape.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/RenderSVGRoot.h ('k') | Source/core/rendering/svg/RenderSVGTSpan.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/svg/RenderSVGShape.h
diff --git a/Source/core/rendering/svg/RenderSVGShape.h b/Source/core/rendering/svg/RenderSVGShape.h
index 356fbe98abbb8158d43828457ab5b281bdf4e37b..6e943a771e53704de3c896e9c1b41c92395807a4 100644
--- a/Source/core/rendering/svg/RenderSVGShape.h
+++ b/Source/core/rendering/svg/RenderSVGShape.h
@@ -46,8 +46,8 @@ public:
virtual ~RenderSVGShape();
void setNeedsShapeUpdate() { m_needsShapeUpdate = true; }
- virtual void setNeedsBoundariesUpdate() OVERRIDE FINAL { m_needsBoundariesUpdate = true; }
- virtual void setNeedsTransformUpdate() OVERRIDE FINAL { m_needsTransformUpdate = true; }
+ virtual void setNeedsBoundariesUpdate() override final { m_needsBoundariesUpdate = true; }
+ virtual void setNeedsTransformUpdate() override final { m_needsTransformUpdate = true; }
virtual void fillShape(GraphicsContext*) const;
virtual void strokeShape(GraphicsContext*) const;
@@ -81,21 +81,21 @@ private:
bool fillContains(const FloatPoint&, bool requiresFill = true, const WindRule fillRule = RULE_NONZERO);
bool strokeContains(const FloatPoint&, bool requiresStroke = true);
- virtual FloatRect paintInvalidationRectInLocalCoordinates() const OVERRIDE FINAL { return m_paintInvalidationBoundingBox; }
- virtual const AffineTransform& localToParentTransform() const OVERRIDE FINAL { return m_localTransform; }
- virtual AffineTransform localTransform() const OVERRIDE FINAL { return m_localTransform; }
+ virtual FloatRect paintInvalidationRectInLocalCoordinates() const override final { return m_paintInvalidationBoundingBox; }
+ virtual const AffineTransform& localToParentTransform() const override final { return m_localTransform; }
+ virtual AffineTransform localTransform() const override final { return m_localTransform; }
- virtual bool isSVGShape() const OVERRIDE FINAL { return true; }
- virtual const char* renderName() const OVERRIDE { return "RenderSVGShape"; }
+ virtual bool isSVGShape() const override final { return true; }
+ virtual const char* renderName() const override { return "RenderSVGShape"; }
- virtual void layout() OVERRIDE FINAL;
- virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
- virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer) const OVERRIDE FINAL;
+ virtual void layout() override final;
+ virtual void paint(PaintInfo&, const LayoutPoint&) override final;
+ virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer) const override final;
- virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) OVERRIDE FINAL;
+ virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) override final;
- virtual FloatRect objectBoundingBox() const OVERRIDE FINAL { return m_fillBoundingBox; }
- virtual FloatRect strokeBoundingBox() const OVERRIDE FINAL { return m_strokeBoundingBox; }
+ virtual FloatRect objectBoundingBox() const override final { return m_fillBoundingBox; }
+ virtual FloatRect strokeBoundingBox() const override final { return m_strokeBoundingBox; }
FloatRect calculateObjectBoundingBox() const;
FloatRect calculateStrokeBoundingBox() const;
void updatePaintInvalidationBoundingBox();
« no previous file with comments | « Source/core/rendering/svg/RenderSVGRoot.h ('k') | Source/core/rendering/svg/RenderSVGTSpan.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698