Index: src/gpu/effects/GrDashingEffect.cpp |
diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp |
index 704a6ac3e67b39d0cc4644fa54a7d46cd86b3b6a..70358e7cef5e6af63eb23f410cb1b2b94c392e65 100644 |
--- a/src/gpu/effects/GrDashingEffect.cpp |
+++ b/src/gpu/effects/GrDashingEffect.cpp |
@@ -456,8 +456,6 @@ public: |
typedef GLDashingCircleEffect GLProcessor; |
- virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE; |
- |
virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE; |
private: |
@@ -465,6 +463,9 @@ private: |
virtual bool onIsEqual(const GrProcessor& other) const SK_OVERRIDE; |
+ virtual void onGetConstantColorComponents(GrColor* color, uint32_t* validFlags, |
+ bool* isSingleComponent) const SK_OVERRIDE; |
+ |
GrPrimitiveEdgeType fEdgeType; |
const GrShaderVar& fInCoord; |
SkScalar fIntervalLength; |
@@ -584,7 +585,8 @@ GrGeometryProcessor* DashingCircleEffect::Create(GrPrimitiveEdgeType edgeType, c |
DashingCircleEffect::~DashingCircleEffect() {} |
-void DashingCircleEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const { |
+void DashingCircleEffect::onGetConstantColorComponents(GrColor* color, uint32_t* validFlags, |
+ bool* isSingleComponent) const { |
*validFlags = 0; |
} |
@@ -668,8 +670,6 @@ public: |
typedef GLDashingLineEffect GLProcessor; |
- virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE; |
- |
virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE; |
private: |
@@ -677,6 +677,9 @@ private: |
virtual bool onIsEqual(const GrProcessor& other) const SK_OVERRIDE; |
+ virtual void onGetConstantColorComponents(GrColor* color, uint32_t* validFlags, |
+ bool* isSingleComponent) const SK_OVERRIDE; |
+ |
GrPrimitiveEdgeType fEdgeType; |
const GrShaderVar& fInCoord; |
SkRect fRect; |
@@ -807,7 +810,8 @@ GrGeometryProcessor* DashingLineEffect::Create(GrPrimitiveEdgeType edgeType, |
DashingLineEffect::~DashingLineEffect() {} |
-void DashingLineEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const { |
+void DashingLineEffect::onGetConstantColorComponents(GrColor* color, uint32_t* validFlags, |
+ bool* isSingleComponent) const { |
*validFlags = 0; |
} |