| Index: include/effects/SkTransparentShader.h
|
| diff --git a/include/effects/SkTransparentShader.h b/include/effects/SkTransparentShader.h
|
| index 96de80abe5453a4d618d0b225674cb80729b5eae..254338c579840d1409db3f025394df3bf9bc76cb 100644
|
| --- a/include/effects/SkTransparentShader.h
|
| +++ b/include/effects/SkTransparentShader.h
|
| @@ -14,16 +14,16 @@ class SK_API SkTransparentShader : public SkShader {
|
| public:
|
| SkTransparentShader() {}
|
|
|
| - virtual size_t contextSize() const SK_OVERRIDE;
|
| + size_t contextSize() const SK_OVERRIDE;
|
|
|
| class TransparentShaderContext : public SkShader::Context {
|
| public:
|
| TransparentShaderContext(const SkTransparentShader& shader, const ContextRec&);
|
| virtual ~TransparentShaderContext();
|
|
|
| - virtual 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 span[], int count) SK_OVERRIDE;
|
| + uint32_t getFlags() const SK_OVERRIDE;
|
| + void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE;
|
| + void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE;
|
|
|
| private:
|
| const SkBitmap* fDevice;
|
| @@ -35,10 +35,10 @@ public:
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTransparentShader)
|
|
|
| protected:
|
| - virtual Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
|
| + Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE;
|
|
|
| // we don't need to flatten anything at all
|
| - virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE {}
|
| + void flatten(SkWriteBuffer&) const SK_OVERRIDE {}
|
|
|
| private:
|
| typedef SkShader INHERITED;
|
|
|