Index: src/gpu/effects/GrDistanceFieldTextureEffect.h |
diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.h b/src/gpu/effects/GrDistanceFieldTextureEffect.h |
index 1be06df936b8c0842e1f917f285130494fa535d8..6edcf988d2a1efe581aff1559b0bccbc0361bd32 100644 |
--- a/src/gpu/effects/GrDistanceFieldTextureEffect.h |
+++ b/src/gpu/effects/GrDistanceFieldTextureEffect.h |
@@ -66,7 +66,7 @@ public: |
virtual ~GrDistanceFieldTextureEffect() {} |
- virtual const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; } |
+ const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; } |
const GrAttribute* inPosition() const { return fInPosition; } |
const GrAttribute* inColor() const { return fInColor; } |
@@ -80,7 +80,7 @@ public: |
const GrGLCaps& caps, |
GrProcessorKeyBuilder* b) const SK_OVERRIDE; |
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; |
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; |
void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE; |
@@ -96,9 +96,9 @@ private: |
#endif |
uint32_t flags, bool opaqueVertexColors); |
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; |
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; |
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; |
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; |
GrTextureAccess fTextureAccess; |
#ifdef SK_GAMMA_APPLY_TO_A8 |
@@ -133,7 +133,7 @@ public: |
virtual ~GrDistanceFieldNoGammaTextureEffect() {} |
- virtual const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; } |
+ const char* name() const SK_OVERRIDE { return "DistanceFieldTexture"; } |
const GrAttribute* inPosition() const { return fInPosition; } |
const GrAttribute* inColor() const { return fInColor; } |
@@ -144,7 +144,7 @@ public: |
const GrGLCaps& caps, |
GrProcessorKeyBuilder* b) const SK_OVERRIDE; |
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; |
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; |
void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE; |
@@ -157,9 +157,9 @@ private: |
const GrTextureParams& params, uint32_t flags, |
bool opaqueVertexColors); |
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; |
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; |
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; |
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; |
GrTextureAccess fTextureAccess; |
uint32_t fFlags; |
@@ -190,7 +190,7 @@ public: |
virtual ~GrDistanceFieldLCDTextureEffect() {} |
- virtual const char* name() const SK_OVERRIDE { return "DistanceFieldLCDTexture"; } |
+ const char* name() const SK_OVERRIDE { return "DistanceFieldLCDTexture"; } |
const GrAttribute* inPosition() const { return fInPosition; } |
const GrAttribute* inTextureCoords() const { return fInTextureCoords; } |
@@ -201,7 +201,7 @@ public: |
const GrGLCaps& caps, |
GrProcessorKeyBuilder* b) const SK_OVERRIDE; |
- virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; |
+ GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE; |
void initBatchTracker(GrBatchTracker* bt, const InitBT& init) const SK_OVERRIDE; |
@@ -215,9 +215,9 @@ private: |
GrTexture* gamma, const GrTextureParams& gammaParams, |
SkColor textColor, uint32_t flags); |
- virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; |
+ bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; |
- virtual void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; |
+ void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; |
GrTextureAccess fTextureAccess; |
GrTextureAccess fGammaTextureAccess; |