Index: include/effects/Sk1DPathEffect.h |
diff --git a/include/effects/Sk1DPathEffect.h b/include/effects/Sk1DPathEffect.h |
index e5a3b5c160e390ee47f101f0fc54d92cdf3af65e..6b3ec6d673b1a1ca962490857ef3f879a45a9538 100644 |
--- a/include/effects/Sk1DPathEffect.h |
+++ b/include/effects/Sk1DPathEffect.h |
@@ -17,7 +17,7 @@ class SkPathMeasure; |
class SK_API Sk1DPathEffect : public SkPathEffect { |
public: |
virtual bool filterPath(SkPath* dst, const SkPath& src, |
- SkStrokeRec*, const SkRect*) const SK_OVERRIDE; |
+ SkStrokeRec*, const SkRect*) const override; |
protected: |
/** Called at the start of each contour, returns the initial offset |
@@ -32,7 +32,7 @@ protected: |
virtual SkScalar next(SkPath* dst, SkScalar dist, SkPathMeasure&) const = 0; |
#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK |
- bool exposedInAndroidJavaAPI() const SK_OVERRIDE { return true; } |
+ bool exposedInAndroidJavaAPI() const override { return true; } |
#endif |
private: |
@@ -62,18 +62,18 @@ public: |
} |
virtual bool filterPath(SkPath*, const SkPath&, |
- SkStrokeRec*, const SkRect*) const SK_OVERRIDE; |
+ SkStrokeRec*, const SkRect*) const override; |
SK_TO_STRING_OVERRIDE() |
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPath1DPathEffect) |
protected: |
SkPath1DPathEffect(const SkPath& path, SkScalar advance, SkScalar phase, Style); |
- void flatten(SkWriteBuffer&) const SK_OVERRIDE; |
+ void flatten(SkWriteBuffer&) const override; |
// overrides from Sk1DPathEffect |
- SkScalar begin(SkScalar contourLength) const SK_OVERRIDE; |
- SkScalar next(SkPath*, SkScalar, SkPathMeasure&) const SK_OVERRIDE; |
+ SkScalar begin(SkScalar contourLength) const override; |
+ SkScalar next(SkPath*, SkScalar, SkPathMeasure&) const override; |
private: |
SkPath fPath; // copied from constructor |