Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(255)

Unified Diff: src/core/SkFilterShader.h

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkEmptyShader.h ('k') | src/core/SkFlate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkFilterShader.h
diff --git a/src/core/SkFilterShader.h b/src/core/SkFilterShader.h
index 65291c8f39e6ca440fc9d6bef6ab48be36c46468..ea5eaed34fe59428574bdd746df474f444e12e6c 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:
« no previous file with comments | « src/core/SkEmptyShader.h ('k') | src/core/SkFlate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698