| Index: include/effects/SkModeColorFilter.h
|
| diff --git a/include/effects/SkModeColorFilter.h b/include/effects/SkModeColorFilter.h
|
| index 6d0d3ccaa0c9d176040c30fb62a42bfe29e45eea..a2cb841699fd76307994ab06d08115725b398f32 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;
|
|
|