| Index: src/core/SkFilterShader.h
|
| diff --git a/src/core/SkFilterShader.h b/src/core/SkFilterShader.h
|
| index 44c2632711e5f97f9aca0db62bdcbdb440bc87a0..dca9567e66c24d830a529b9c62aeb1c36e2d8124 100644
|
| --- a/src/core/SkFilterShader.h
|
| +++ b/src/core/SkFilterShader.h
|
| @@ -17,7 +17,7 @@ public:
|
| SkFilterShader(SkShader* shader, SkColorFilter* filter);
|
| virtual ~SkFilterShader();
|
|
|
| - virtual size_t contextSize() const SK_OVERRIDE;
|
| + size_t contextSize() const SK_OVERRIDE;
|
|
|
| class FilterShaderContext : public SkShader::Context {
|
| public:
|
| @@ -25,12 +25,12 @@ public:
|
| FilterShaderContext(const SkFilterShader&, SkShader::Context*, const ContextRec&);
|
| virtual ~FilterShaderContext();
|
|
|
| - virtual uint32_t getFlags() const SK_OVERRIDE;
|
| + uint32_t getFlags() const SK_OVERRIDE;
|
|
|
| - virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE;
|
| - virtual void shadeSpan16(int x, int y, uint16_t[], int count) SK_OVERRIDE;
|
| + void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE;
|
| + void shadeSpan16(int x, int y, uint16_t[], int count) SK_OVERRIDE;
|
|
|
| - virtual void set3DMask(const SkMask* mask) SK_OVERRIDE {
|
| + void set3DMask(const SkMask* mask) SK_OVERRIDE {
|
| // forward to our proxy
|
| fShaderContext->set3DMask(mask);
|
| }
|
| @@ -45,8 +45,8 @@ public:
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkFilterShader)
|
|
|
| protected:
|
| - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
| - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
|
| + void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
| + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
|
|
|
|
|
| private:
|
|
|