diff options
| author |  mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
| commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
| tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /src/core/SkFilterShader.h | |
| parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (diff) | |
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'src/core/SkFilterShader.h')
| -rw-r--r-- | src/core/SkFilterShader.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/SkFilterShader.h b/src/core/SkFilterShader.h index 65291c8f39..ea5eaed34f 100644 --- a/src/core/SkFilterShader.h +++ b/src/core/SkFilterShader.h @@ -17,7 +17,7 @@ public: SkFilterShader(SkShader* shader, SkColorFilter* filter); virtual ~SkFilterShader(); - size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const override; class FilterShaderContext : public SkShader::Context { public: @@ -25,11 +25,11 @@ public: FilterShaderContext(const SkFilterShader&, SkShader::Context*, const ContextRec&); virtual ~FilterShaderContext(); - uint32_t getFlags() const SK_OVERRIDE; + uint32_t getFlags() const override; - void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor[], int count) override; - void set3DMask(const SkMask* mask) SK_OVERRIDE { + void set3DMask(const SkMask* mask) override { // forward to our proxy fShaderContext->set3DMask(mask); } @@ -44,8 +44,8 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkFilterShader) protected: - void flatten(SkWriteBuffer&) const SK_OVERRIDE; - Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; + Context* onCreateContext(const ContextRec&, void* storage) const override; private: |