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/SkModeColorFilter.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/SkModeColorFilter.h')
| -rw-r--r-- | include/effects/SkModeColorFilter.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/effects/SkModeColorFilter.h b/include/effects/SkModeColorFilter.h index 6d0d3ccaa0..a2cb841699 100644 --- a/include/effects/SkModeColorFilter.h +++ b/include/effects/SkModeColorFilter.h @@ -25,12 +25,12 @@ public: SkXfermode::Mode getMode() const { return fMode; } SkPMColor getPMColor() const { return fPMColor; } - bool asColorMode(SkColor*, SkXfermode::Mode*) const SK_OVERRIDE; - uint32_t getFlags() const SK_OVERRIDE; - void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const SK_OVERRIDE; + bool asColorMode(SkColor*, SkXfermode::Mode*) const override; + uint32_t getFlags() const override; + void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const override; #ifndef SK_IGNORE_TO_STRING - void toString(SkString* str) const SK_OVERRIDE { + void toString(SkString* str) const override { str->append("SkModeColorFilter: color: 0x"); str->appendHex(fColor); str->append(" mode: "); @@ -39,12 +39,12 @@ public: #endif #if SK_SUPPORT_GPU - bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const SK_OVERRIDE; + bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const override; #endif SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkModeColorFilter) protected: - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; private: SkColor fColor; |