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

Unified Diff: Source/core/rendering/style/BasicShapes.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/shapes/ShapeOutsideInfo.h ('k') | Source/core/rendering/style/ContentData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/BasicShapes.h
diff --git a/Source/core/rendering/style/BasicShapes.h b/Source/core/rendering/style/BasicShapes.h
index ed7ace52f546325272faf1b7406fbe2926dad45f..1b3ace42b6db028007f6019d7023616f08d434f4 100644
--- a/Source/core/rendering/style/BasicShapes.h
+++ b/Source/core/rendering/style/BasicShapes.h
@@ -149,7 +149,7 @@ private:
};
-class BasicShapeCircle FINAL : public BasicShape {
+class BasicShapeCircle final : public BasicShape {
public:
static PassRefPtr<BasicShapeCircle> create() { return adoptRef(new BasicShapeCircle); }
@@ -162,11 +162,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;
+ virtual void path(Path&, const FloatRect&) override;
+ virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
+ virtual bool operator==(const BasicShape&) const override;
- virtual Type type() const OVERRIDE { return BasicShapeCircleType; }
+ virtual Type type() const override { return BasicShapeCircleType; }
private:
BasicShapeCircle() { }
@@ -177,7 +177,7 @@ private:
DEFINE_BASICSHAPE_TYPE_CASTS(BasicShapeCircle);
-class BasicShapeEllipse FINAL : public BasicShape {
+class BasicShapeEllipse final : public BasicShape {
public:
static PassRefPtr<BasicShapeEllipse> create() { return adoptRef(new BasicShapeEllipse); }
@@ -192,11 +192,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;
+ virtual void path(Path&, const FloatRect&) override;
+ virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
+ virtual bool operator==(const BasicShape&) const override;
- virtual Type type() const OVERRIDE { return BasicShapeEllipseType; }
+ virtual Type type() const override { return BasicShapeEllipseType; }
private:
BasicShapeEllipse() { }
@@ -208,7 +208,7 @@ private:
DEFINE_BASICSHAPE_TYPE_CASTS(BasicShapeEllipse);
-class BasicShapePolygon FINAL : public BasicShape {
+class BasicShapePolygon final : public BasicShape {
public:
static PassRefPtr<BasicShapePolygon> create() { return adoptRef(new BasicShapePolygon); }
@@ -219,13 +219,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;
+ virtual void path(Path&, const FloatRect&) override;
+ virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
+ virtual bool operator==(const BasicShape&) const override;
- virtual WindRule windRule() const OVERRIDE { return m_windRule; }
+ virtual WindRule windRule() const override { return m_windRule; }
- virtual Type type() const OVERRIDE { return BasicShapePolygonType; }
+ virtual Type type() const override { return BasicShapePolygonType; }
private:
BasicShapePolygon()
: m_windRule(RULE_NONZERO)
@@ -261,11 +261,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;
+ virtual void path(Path&, const FloatRect&) override;
+ virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const override;
+ virtual bool operator==(const BasicShape&) const override;
- virtual Type type() const OVERRIDE { return BasicShapeInsetType; }
+ virtual Type type() const override { return BasicShapeInsetType; }
private:
BasicShapeInset() { }
« no previous file with comments | « Source/core/rendering/shapes/ShapeOutsideInfo.h ('k') | Source/core/rendering/style/ContentData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698