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

Unified Diff: Source/core/style/BasicShapes.h

Issue 1226293002: Fix virtual/override/final usage in Source/core/{animation,css,style}/. (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/css/StyleRuleImport.h ('k') | Source/core/style/ContentData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/style/BasicShapes.h
diff --git a/Source/core/style/BasicShapes.h b/Source/core/style/BasicShapes.h
index b5600b56f5a5bb8815af2749da1676023e546a8e..b5d9c8fbff7c832798952d674cdc727df028df98 100644
--- a/Source/core/style/BasicShapes.h
+++ b/Source/core/style/BasicShapes.h
@@ -163,11 +163,11 @@ public:
void setCenterY(BasicShapeCenterCoordinate centerY) { m_centerY = centerY; }
void setRadius(BasicShapeRadius radius) { m_radius = radius; }
- virtual void path(Path&, const FloatRect&) override;
- virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
- virtual bool operator==(const BasicShape&) const override;
+ void path(Path&, const FloatRect&) override;
+ PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
+ bool operator==(const BasicShape&) const override;
- virtual Type type() const override { return BasicShapeCircleType; }
+ Type type() const override { return BasicShapeCircleType; }
private:
BasicShapeCircle() { }
@@ -193,11 +193,11 @@ public:
void setRadiusX(BasicShapeRadius radiusX) { m_radiusX = radiusX; }
void setRadiusY(BasicShapeRadius radiusY) { m_radiusY = radiusY; }
- virtual void path(Path&, const FloatRect&) override;
- virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
- virtual bool operator==(const BasicShape&) const override;
+ void path(Path&, const FloatRect&) override;
+ PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
+ bool operator==(const BasicShape&) const override;
- virtual Type type() const override { return BasicShapeEllipseType; }
+ Type type() const override { return BasicShapeEllipseType; }
private:
BasicShapeEllipse() { }
@@ -220,13 +220,13 @@ public:
void setWindRule(WindRule windRule) { m_windRule = windRule; }
void appendPoint(const Length& x, const Length& y) { m_values.append(x); m_values.append(y); }
- virtual void path(Path&, const FloatRect&) override;
- virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
- virtual bool operator==(const BasicShape&) const override;
+ void path(Path&, const FloatRect&) override;
+ PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
+ bool operator==(const BasicShape&) const override;
- virtual WindRule windRule() const override { return m_windRule; }
+ WindRule windRule() const override { return m_windRule; }
- virtual Type type() const override { return BasicShapePolygonType; }
+ Type type() const override { return BasicShapePolygonType; }
private:
BasicShapePolygon()
: m_windRule(RULE_NONZERO)
@@ -262,11 +262,11 @@ public:
void setBottomRightRadius(const LengthSize& radius) { m_bottomRightRadius = radius; }
void setBottomLeftRadius(const LengthSize& radius) { m_bottomLeftRadius = radius; }
- virtual void path(Path&, const FloatRect&) override;
- virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
- virtual bool operator==(const BasicShape&) const override;
+ void path(Path&, const FloatRect&) override;
+ PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
+ bool operator==(const BasicShape&) const override;
- virtual Type type() const override { return BasicShapeInsetType; }
+ Type type() const override { return BasicShapeInsetType; }
private:
BasicShapeInset() { }
« no previous file with comments | « Source/core/css/StyleRuleImport.h ('k') | Source/core/style/ContentData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698