| Index: src/effects/SkTableColorFilter.cpp
|
| diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
|
| index e12b3d78ec2d0ed0e2f6d0ea90da9ebd322a78bc..37fdd902232a481535a0f76b67c0ee99b91d3863 100644
|
| --- a/src/effects/SkTableColorFilter.cpp
|
| +++ b/src/effects/SkTableColorFilter.cpp
|
| @@ -40,10 +40,10 @@ public:
|
| SkDELETE(fBitmap);
|
| }
|
|
|
| - virtual bool asComponentTable(SkBitmap* table) const SK_OVERRIDE;
|
| + bool asComponentTable(SkBitmap* table) const SK_OVERRIDE;
|
|
|
| #if SK_SUPPORT_GPU
|
| - virtual GrFragmentProcessor* asFragmentProcessor(GrContext* context) const SK_OVERRIDE;
|
| + GrFragmentProcessor* asFragmentProcessor(GrContext* context) const SK_OVERRIDE;
|
| #endif
|
|
|
| virtual void filterSpan(const SkPMColor src[], int count,
|
| @@ -61,7 +61,7 @@ public:
|
| };
|
|
|
| protected:
|
| - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
| + void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
|
|
| private:
|
| mutable const SkBitmap* fBitmap; // lazily allocated
|
| @@ -289,19 +289,19 @@ public:
|
|
|
| virtual ~ColorTableEffect();
|
|
|
| - virtual const char* name() const SK_OVERRIDE { return "ColorTable"; }
|
| + const char* name() const SK_OVERRIDE { return "ColorTable"; }
|
|
|
| - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
|
| + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
|
|
|
| - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
|
| + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
|
|
|
| const GrTextureStripAtlas* atlas() const { return fAtlas; }
|
| int atlasRow() const { return fRow; }
|
|
|
| private:
|
| - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE;
|
| + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE;
|
|
|
| - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
|
| + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
|
|
|
| ColorTableEffect(GrTexture* texture, GrTextureStripAtlas* atlas, int row, unsigned flags);
|
|
|
| @@ -329,7 +329,7 @@ public:
|
| const TransformedCoordsArray&,
|
| const TextureSamplerArray&) SK_OVERRIDE;
|
|
|
| - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
|
| + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
|
|
|
| static void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder* b) {}
|
|
|
|
|