Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I8ca36eee41eba7e9a56d6728a9d19e5883d7058c
diff --git a/Source/core/svg/SVGPathSegListBuilder.h b/Source/core/svg/SVGPathSegListBuilder.h
index 7b5c3aa..8b209c6 100644
--- a/Source/core/svg/SVGPathSegListBuilder.h
+++ b/Source/core/svg/SVGPathSegListBuilder.h
@@ -32,7 +32,7 @@
class SVGPathElement;
-class SVGPathSegListBuilder : public SVGPathConsumer {
+class SVGPathSegListBuilder FINAL : public SVGPathConsumer {
public:
SVGPathSegListBuilder();
@@ -41,9 +41,9 @@
void setCurrentSVGPathSegRole(SVGPathSegRole pathSegRole) { m_pathSegRole = pathSegRole; }
private:
- virtual void incrementPathSegmentCount() { }
- virtual bool continueConsuming() { return true; }
- virtual void cleanup()
+ virtual void incrementPathSegmentCount() OVERRIDE { }
+ virtual bool continueConsuming() OVERRIDE { return true; }
+ virtual void cleanup() OVERRIDE
{
m_pathElement = 0;
m_pathSegList = 0;
@@ -51,18 +51,18 @@
}
// Used in UnalteredParsing/NormalizedParsing modes.
- virtual void moveTo(const FloatPoint&, bool closed, PathCoordinateMode);
- virtual void lineTo(const FloatPoint&, PathCoordinateMode);
- virtual void curveToCubic(const FloatPoint&, const FloatPoint&, const FloatPoint&, PathCoordinateMode);
- virtual void closePath();
+ virtual void moveTo(const FloatPoint&, bool closed, PathCoordinateMode) OVERRIDE;
+ virtual void lineTo(const FloatPoint&, PathCoordinateMode) OVERRIDE;
+ virtual void curveToCubic(const FloatPoint&, const FloatPoint&, const FloatPoint&, PathCoordinateMode) OVERRIDE;
+ virtual void closePath() OVERRIDE;
// Only used in UnalteredParsing mode.
- virtual void lineToHorizontal(float, PathCoordinateMode);
- virtual void lineToVertical(float, PathCoordinateMode);
- virtual void curveToCubicSmooth(const FloatPoint&, const FloatPoint&, PathCoordinateMode);
- virtual void curveToQuadratic(const FloatPoint&, const FloatPoint&, PathCoordinateMode);
- virtual void curveToQuadraticSmooth(const FloatPoint&, PathCoordinateMode);
- virtual void arcTo(float, float, float, bool largeArcFlag, bool sweepFlag, const FloatPoint&, PathCoordinateMode);
+ virtual void lineToHorizontal(float, PathCoordinateMode) OVERRIDE;
+ virtual void lineToVertical(float, PathCoordinateMode) OVERRIDE;
+ virtual void curveToCubicSmooth(const FloatPoint&, const FloatPoint&, PathCoordinateMode) OVERRIDE;
+ virtual void curveToQuadratic(const FloatPoint&, const FloatPoint&, PathCoordinateMode) OVERRIDE;
+ virtual void curveToQuadraticSmooth(const FloatPoint&, PathCoordinateMode) OVERRIDE;
+ virtual void arcTo(float, float, float, bool largeArcFlag, bool sweepFlag, const FloatPoint&, PathCoordinateMode) OVERRIDE;
SVGPathElement* m_pathElement;
SVGPathSegList* m_pathSegList;