| Index: src/gpu/effects/GrBitmapTextGeoProc.h
|
| diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h
|
| index c69ffd7a1b72998b7483a47de450a7567772611d..85e4f421e145e4f707a0d24645bacaf6d42b5509 100644
|
| --- a/src/gpu/effects/GrBitmapTextGeoProc.h
|
| +++ b/src/gpu/effects/GrBitmapTextGeoProc.h
|
| @@ -30,7 +30,7 @@ public:
|
|
|
| virtual ~GrBitmapTextGeoProc() {}
|
|
|
| - virtual const char* name() const SK_OVERRIDE { return "Texture"; }
|
| + const char* name() const SK_OVERRIDE { return "Texture"; }
|
|
|
| const GrAttribute* inPosition() const { return fInPosition; }
|
| const GrAttribute* inColor() const { return fInColor; }
|
| @@ -40,7 +40,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*, const InitBT&) const SK_OVERRIDE;
|
| bool onCanMakeEqual(const GrBatchTracker&,
|
| @@ -51,9 +51,9 @@ private:
|
| GrBitmapTextGeoProc(GrColor, GrTexture* texture, const GrTextureParams& params,
|
| bool useColorAttrib, bool opaqueVertexColors, const SkMatrix& localMatrix);
|
|
|
| - 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;
|
| const GrAttribute* fInPosition;
|
|
|