diff options
author | mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /include/effects/SkMorphologyImageFilter.h | |
parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (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/SkMorphologyImageFilter.h')
-rw-r--r-- | include/effects/SkMorphologyImageFilter.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h index c5c5c7401e..7d409e8753 100644 --- a/include/effects/SkMorphologyImageFilter.h +++ b/include/effects/SkMorphologyImageFilter.h @@ -15,8 +15,8 @@ class SK_API SkMorphologyImageFilter : public SkImageFilter { public: - void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; - bool onFilterBounds(const SkIRect& src, const SkMatrix& ctm, SkIRect* dst) const SK_OVERRIDE; + void computeFastBounds(const SkRect& src, SkRect* dst) const override; + bool onFilterBounds(const SkIRect& src, const SkMatrix& ctm, SkIRect* dst) const override; /** * All morphology procs have the same signature: src is the source buffer, dst the @@ -34,9 +34,9 @@ protected: bool filterImageGeneric(Proc procX, Proc procY, Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const; - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; #if SK_SUPPORT_GPU - bool canFilterImageGPU() const SK_OVERRIDE { return true; } + bool canFilterImageGPU() const override { return true; } bool filterImageGPUGeneric(bool dilate, Proxy* proxy, const SkBitmap& src, const Context& ctm, SkBitmap* result, SkIPoint* offset) const; @@ -61,10 +61,10 @@ public: } virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* offset) const override; #if SK_SUPPORT_GPU virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* offset) const override; #endif SK_TO_STRING_OVERRIDE() @@ -89,10 +89,10 @@ public: } virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* offset) const override; #if SK_SUPPORT_GPU virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* offset) const override; #endif SK_TO_STRING_OVERRIDE() |