From 36352bf5e38f45a70ee4f4fc132a38048d38206d Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 25 Mar 2015 18:17:31 -0700 Subject: 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 --- include/effects/SkModeColorFilter.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/effects/SkModeColorFilter.h') 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*) const SK_OVERRIDE; + bool asFragmentProcessors(GrContext*, SkTDArray*) 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; -- cgit v1.2.3