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

Unified Diff: include/effects/SkColorMatrixFilter.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/SkColorFilterImageFilter.h ('k') | include/effects/SkComposeImageFilter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/effects/SkColorMatrixFilter.h
diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h
index 4cb24bad5de4d67436bb93168b449c633aca0f47..27a2be835b3b8d6760800b5e76bb662c9cfddb85 100644
--- a/include/effects/SkColorMatrixFilter.h
+++ b/include/effects/SkColorMatrixFilter.h
@@ -20,13 +20,13 @@ public:
return SkNEW_ARGS(SkColorMatrixFilter, (array));
}
- void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE;
- uint32_t getFlags() const SK_OVERRIDE;
- bool asColorMatrix(SkScalar matrix[20]) const SK_OVERRIDE;
- SkColorFilter* newComposed(const SkColorFilter*) const SK_OVERRIDE;
+ void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const override;
+ uint32_t getFlags() const override;
+ bool asColorMatrix(SkScalar matrix[20]) const override;
+ SkColorFilter* newComposed(const SkColorFilter*) const override;
#if SK_SUPPORT_GPU
- bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const SK_OVERRIDE;
+ bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const override;
#endif
struct State {
@@ -41,7 +41,7 @@ public:
protected:
explicit SkColorMatrixFilter(const SkColorMatrix&);
explicit SkColorMatrixFilter(const SkScalar array[20]);
- void flatten(SkWriteBuffer&) const SK_OVERRIDE;
+ void flatten(SkWriteBuffer&) const override;
private:
SkColorMatrix fMatrix;
« no previous file with comments | « include/effects/SkColorFilterImageFilter.h ('k') | include/effects/SkComposeImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698