| Index: src/effects/SkTableColorFilter.cpp
|
| diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
|
| index 073bc188053bde9cba1001d6e0bf99cc9665a276..a319f0809b6bc82558f6d953f1b29f20c5716f39 100644
|
| --- a/src/effects/SkTableColorFilter.cpp
|
| +++ b/src/effects/SkTableColorFilter.cpp
|
| @@ -40,14 +40,14 @@ public:
|
| SkDELETE(fBitmap);
|
| }
|
|
|
| - bool asComponentTable(SkBitmap* table) const SK_OVERRIDE;
|
| - SkColorFilter* newComposed(const SkColorFilter* inner) const SK_OVERRIDE;
|
| + bool asComponentTable(SkBitmap* table) const override;
|
| + SkColorFilter* newComposed(const SkColorFilter* inner) const override;
|
|
|
| #if SK_SUPPORT_GPU
|
| - bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const SK_OVERRIDE;
|
| + bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const override;
|
| #endif
|
|
|
| - void filterSpan(const SkPMColor src[], int count, SkPMColor dst[]) const SK_OVERRIDE;
|
| + void filterSpan(const SkPMColor src[], int count, SkPMColor dst[]) const override;
|
|
|
| SK_TO_STRING_OVERRIDE()
|
|
|
| @@ -61,7 +61,7 @@ public:
|
| };
|
|
|
| protected:
|
| - void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
| + void flatten(SkWriteBuffer&) const override;
|
|
|
| private:
|
| mutable const SkBitmap* fBitmap; // lazily allocated
|
| @@ -338,19 +338,19 @@ public:
|
|
|
| virtual ~ColorTableEffect();
|
|
|
| - const char* name() const SK_OVERRIDE { return "ColorTable"; }
|
| + const char* name() const override { return "ColorTable"; }
|
|
|
| - void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
|
| + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const override;
|
|
|
| - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
|
| + GrGLFragmentProcessor* createGLInstance() const override;
|
|
|
| const GrTextureStripAtlas* atlas() const { return fAtlas; }
|
| int atlasRow() const { return fRow; }
|
|
|
| private:
|
| - bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE;
|
| + bool onIsEqual(const GrFragmentProcessor&) const override;
|
|
|
| - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
|
| + void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
|
|
|
| ColorTableEffect(GrTexture* texture, GrTextureStripAtlas* atlas, int row, unsigned flags);
|
|
|
| @@ -376,9 +376,9 @@ public:
|
| const char* outputColor,
|
| const char* inputColor,
|
| const TransformedCoordsArray&,
|
| - const TextureSamplerArray&) SK_OVERRIDE;
|
| + const TextureSamplerArray&) override;
|
|
|
| - void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
|
| + void setData(const GrGLProgramDataManager&, const GrProcessor&) override;
|
|
|
| static void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder* b) {}
|
|
|
|
|