| Index: src/gpu/effects/GrConvexPolyEffect.cpp
|
| diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/effects/GrConvexPolyEffect.cpp
|
| index 14307165e3b3415a5747c7de96818d42db64a0a0..7035094fa6a57794c7a7f48b27747c18d2ffb613 100644
|
| --- a/src/gpu/effects/GrConvexPolyEffect.cpp
|
| +++ b/src/gpu/effects/GrConvexPolyEffect.cpp
|
| @@ -23,11 +23,11 @@ public:
|
|
|
| GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }
|
|
|
| - virtual const char* name() const SK_OVERRIDE { return "AARect"; }
|
| + const char* name() const SK_OVERRIDE { return "AARect"; }
|
|
|
| - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
|
| + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
|
|
|
| - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
|
| + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
|
|
|
| private:
|
| AARectEffect(GrPrimitiveEdgeType edgeType, const SkRect& rect)
|
| @@ -36,12 +36,12 @@ private:
|
| this->setWillReadFragmentPosition();
|
| }
|
|
|
| - virtual bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE {
|
| + bool onIsEqual(const GrFragmentProcessor& other) const SK_OVERRIDE {
|
| const AARectEffect& aare = other.cast<AARectEffect>();
|
| return fRect == aare.fRect;
|
| }
|
|
|
| - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE {
|
| + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE {
|
| if (fRect.isEmpty()) {
|
| // An empty rect will have no coverage anywhere.
|
| inout->mulByKnownSingleComponent(0);
|
| @@ -94,7 +94,7 @@ public:
|
|
|
| static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*);
|
|
|
| - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
|
| + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
|
|
|
| private:
|
| GrGLProgramDataManager::UniformHandle fRectUniform;
|
| @@ -189,7 +189,7 @@ public:
|
|
|
| static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*);
|
|
|
| - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
|
| + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
|
|
|
| private:
|
| GrGLProgramDataManager::UniformHandle fEdgeUniform;
|
|
|