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 /include/effects/SkPerlinNoiseShader.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 'include/effects/SkPerlinNoiseShader.h')
-rw-r--r-- | include/effects/SkPerlinNoiseShader.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h index b318ef1cd0..fe1c9c5728 100644 --- a/include/effects/SkPerlinNoiseShader.h +++ b/include/effects/SkPerlinNoiseShader.h @@ -72,15 +72,15 @@ public: } - size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const override; class PerlinNoiseShaderContext : public SkShader::Context { public: PerlinNoiseShaderContext(const SkPerlinNoiseShader& shader, const ContextRec&); virtual ~PerlinNoiseShaderContext(); - void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; - void shadeSpan16(int x, int y, uint16_t[], int count) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor[], int count) override; + void shadeSpan16(int x, int y, uint16_t[], int count) override; private: SkPMColor shade(const SkPoint& point, StitchData& stitchData) const; @@ -98,14 +98,14 @@ public: virtual bool asFragmentProcessor(GrContext* context, const SkPaint&, const SkMatrix& viewM, const SkMatrix*, GrColor*, - GrFragmentProcessor**) const SK_OVERRIDE; + GrFragmentProcessor**) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPerlinNoiseShader) 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: SkPerlinNoiseShader(SkPerlinNoiseShader::Type type, SkScalar baseFrequencyX, |