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 /tests/GLProgramsTest.cpp | |
| 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 'tests/GLProgramsTest.cpp')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index b2204b4b2b..ed74ae8f6a 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -61,14 +61,14 @@ public: return SkRef(gBigKeyProcessor); } - const char* name() const SK_OVERRIDE { return "Big Ole Key"; } + const char* name() const override { return "Big Ole Key"; } virtual void getGLProcessorKey(const GrGLCaps& caps, - GrProcessorKeyBuilder* b) const SK_OVERRIDE { + GrProcessorKeyBuilder* b) const override { GLBigKeyProcessor::GenKey(*this, caps, b); } - GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { + GrGLFragmentProcessor* createGLInstance() const override { return SkNEW_ARGS(GLBigKeyProcessor, (*this)); } @@ -76,8 +76,8 @@ private: BigKeyProcessor() { this->initClassID<BigKeyProcessor>(); } - bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } - void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { } + bool onIsEqual(const GrFragmentProcessor&) const override { return true; } + void onComputeInvariantOutput(GrInvariantOutput* inout) const override { } GR_DECLARE_FRAGMENT_PROCESSOR_TEST; |