| Index: include/core/SkPathEffect.h
|
| diff --git a/include/core/SkPathEffect.h b/include/core/SkPathEffect.h
|
| index 7e2d1ae6a4ed23d3210dd0f7b5494e8e82f0f277..09070bd33128bc3fd4f282da0d42deca8a5cc214 100644
|
| --- a/include/core/SkPathEffect.h
|
| +++ b/include/core/SkPathEffect.h
|
| @@ -163,7 +163,7 @@ public:
|
| protected:
|
| SkPairPathEffect(SkPathEffect* pe0, SkPathEffect* pe1);
|
|
|
| - void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
| + void flatten(SkWriteBuffer&) const override;
|
|
|
| // these are visible to our subclasses
|
| SkPathEffect* fPE0, *fPE1;
|
| @@ -191,13 +191,13 @@ public:
|
| }
|
|
|
| virtual bool filterPath(SkPath* dst, const SkPath& src,
|
| - SkStrokeRec*, const SkRect*) const SK_OVERRIDE;
|
| + SkStrokeRec*, const SkRect*) const override;
|
|
|
| SK_TO_STRING_OVERRIDE()
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposePathEffect)
|
|
|
| #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
|
| - bool exposedInAndroidJavaAPI() const SK_OVERRIDE { return true; }
|
| + bool exposedInAndroidJavaAPI() const override { return true; }
|
| #endif
|
|
|
| protected:
|
| @@ -228,13 +228,13 @@ public:
|
| }
|
|
|
| virtual bool filterPath(SkPath* dst, const SkPath& src,
|
| - SkStrokeRec*, const SkRect*) const SK_OVERRIDE;
|
| + SkStrokeRec*, const SkRect*) const override;
|
|
|
| SK_TO_STRING_OVERRIDE()
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSumPathEffect)
|
|
|
| #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
|
| - bool exposedInAndroidJavaAPI() const SK_OVERRIDE { return true; }
|
| + bool exposedInAndroidJavaAPI() const override { return true; }
|
| #endif
|
|
|
| protected:
|
|
|