Index: src/gpu/effects/GrRRectEffect.cpp |
diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp |
index f5131feba4bd3f7277378a2281694c9d021894d0..e5df7d27c71eea3aad79078a6489cfc6abbd8856 100644 |
--- a/src/gpu/effects/GrRRectEffect.cpp |
+++ b/src/gpu/effects/GrRRectEffect.cpp |
@@ -59,8 +59,6 @@ public: |
typedef GLCircularRRectEffect GLProcessor; |
- virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE; |
- |
virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE; |
private: |
@@ -68,6 +66,9 @@ private: |
virtual bool onIsEqual(const GrProcessor& other) const SK_OVERRIDE; |
+ virtual void onGetConstantColorComponents(GrColor* color, uint32_t* validFlags, |
+ bool* isSingleComponent) const SK_OVERRIDE; |
+ |
SkRRect fRRect; |
GrPrimitiveEdgeType fEdgeType; |
uint32_t fCircularCornerFlags; |
@@ -86,7 +87,8 @@ GrFragmentProcessor* CircularRRectEffect::Create(GrPrimitiveEdgeType edgeType, |
return SkNEW_ARGS(CircularRRectEffect, (edgeType, circularCornerFlags, rrect)); |
} |
-void CircularRRectEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const { |
+void CircularRRectEffect::onGetConstantColorComponents(GrColor* color, uint32_t* validFlags, |
+ bool* isSingleComponent) const { |
*validFlags = 0; |
} |
@@ -399,8 +401,6 @@ public: |
typedef GLEllipticalRRectEffect GLProcessor; |
- virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE; |
- |
virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE; |
private: |
@@ -408,6 +408,9 @@ private: |
virtual bool onIsEqual(const GrProcessor& other) const SK_OVERRIDE; |
+ virtual void onGetConstantColorComponents(GrColor* color, uint32_t* validFlags, |
+ bool* isSingleComponent) const SK_OVERRIDE; |
+ |
SkRRect fRRect; |
GrPrimitiveEdgeType fEdgeType; |
@@ -424,7 +427,8 @@ EllipticalRRectEffect::Create(GrPrimitiveEdgeType edgeType, const SkRRect& rrect |
return SkNEW_ARGS(EllipticalRRectEffect, (edgeType, rrect)); |
} |
-void EllipticalRRectEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const { |
+void EllipticalRRectEffect::onGetConstantColorComponents(GrColor* color, uint32_t* validFlags, |
+ bool* isSingleComponent) const { |
*validFlags = 0; |
} |