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/gpu/GrGeometryProcessor.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/gpu/GrGeometryProcessor.h')
-rw-r--r-- | src/gpu/GrGeometryProcessor.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/GrGeometryProcessor.h b/src/gpu/GrGeometryProcessor.h index 7f8d041af8..f0e0b0c008 100644 --- a/src/gpu/GrGeometryProcessor.h +++ b/src/gpu/GrGeometryProcessor.h @@ -44,7 +44,7 @@ public: */ bool canMakeEqual(const GrBatchTracker& mine, const GrPrimitiveProcessor& that, - const GrBatchTracker& theirs) const SK_OVERRIDE { + const GrBatchTracker& theirs) const override { if (this->classID() != that.classID() || !this->hasSameTextureAccesses(that)) { return false; } @@ -76,8 +76,8 @@ public: // TODO this is a total hack until the gp can do deferred geometry bool hasVertexColor() const { return fHasVertexColor; } - void getInvariantOutputColor(GrInitInvariantOutput* out) const SK_OVERRIDE; - void getInvariantOutputCoverage(GrInitInvariantOutput* out) const SK_OVERRIDE; + void getInvariantOutputColor(GrInitInvariantOutput* out) const override; + void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override; protected: /* @@ -142,7 +142,7 @@ private: // TODO delete this when we have more advanced equality testing via bundles and the BT virtual bool onIsEqual(const GrGeometryProcessor&) const = 0; - bool hasExplicitLocalCoords() const SK_OVERRIDE { return fHasLocalCoords; } + bool hasExplicitLocalCoords() const override { return fHasLocalCoords; } GrColor fColor; bool fOpaqueVertexColors; |