Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: include/effects/SkMorphologyImageFilter.h

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/effects/SkModeColorFilter.h ('k') | include/effects/SkOffsetImageFilter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/effects/SkMorphologyImageFilter.h
diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h
index c5c5c7401e5e540a264e4441e635bae0452e9a8e..7d409e87534ea65d8465286f2e1fa29bb988d575 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()
« no previous file with comments | « include/effects/SkModeColorFilter.h ('k') | include/effects/SkOffsetImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698