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/GrPathProcessor.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/GrPathProcessor.h')
-rw-r--r-- | src/gpu/GrPathProcessor.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gpu/GrPathProcessor.h b/src/gpu/GrPathProcessor.h index 03d3907459..b6b6f6e5a8 100644 --- a/src/gpu/GrPathProcessor.h +++ b/src/gpu/GrPathProcessor.h @@ -29,33 +29,33 @@ public: return SkNEW_ARGS(GrPathProcessor, (color, viewMatrix, localMatrix)); } - void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const SK_OVERRIDE; + void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const override; bool canMakeEqual(const GrBatchTracker& mine, const GrPrimitiveProcessor& that, - const GrBatchTracker& theirs) const SK_OVERRIDE; + const GrBatchTracker& theirs) const override; - const char* name() const SK_OVERRIDE { return "PathProcessor"; } + const char* name() const override { return "PathProcessor"; } GrColor color() const { return fColor; } - 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; - bool willUseGeoShader() const SK_OVERRIDE { return false; } + bool willUseGeoShader() const override { return false; } virtual void getGLProcessorKey(const GrBatchTracker& bt, const GrGLCaps& caps, - GrProcessorKeyBuilder* b) const SK_OVERRIDE; + GrProcessorKeyBuilder* b) const override; virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt, - const GrGLCaps& caps) const SK_OVERRIDE; + const GrGLCaps& caps) const override; protected: GrPathProcessor(GrColor color, const SkMatrix& viewMatrix, const SkMatrix& localMatrix); private: - bool hasExplicitLocalCoords() const SK_OVERRIDE { return false; } + bool hasExplicitLocalCoords() const override { return false; } GrColor fColor; |