aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/effects/SkComposeImageFilter.h
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-03-25 18:17:31 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-25 18:17:32 -0700
commit36352bf5e38f45a70ee4f4fc132a38048d38206d (patch)
tree24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /include/effects/SkComposeImageFilter.h
parent02fd592c8d190058652bb715fb34feb7a72992e5 (diff)
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'include/effects/SkComposeImageFilter.h')
-rw-r--r--include/effects/SkComposeImageFilter.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/effects/SkComposeImageFilter.h b/include/effects/SkComposeImageFilter.h
index 361ca2b8fe..e3dc1ffb23 100644
--- a/include/effects/SkComposeImageFilter.h
+++ b/include/effects/SkComposeImageFilter.h
@@ -24,7 +24,7 @@ public:
SkImageFilter* inputs[2] = { outer, inner };
return SkNEW_ARGS(SkComposeImageFilter, (inputs));
}
- void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
+ void computeFastBounds(const SkRect& src, SkRect* dst) const override;
SK_TO_STRING_OVERRIDE()
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter)
@@ -35,8 +35,8 @@ protected:
SkASSERT(inputs[1]);
}
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
- SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE;
- bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE;
+ SkBitmap* result, SkIPoint* loc) const override;
+ bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const override;
private:
typedef SkImageFilter INHERITED;