| Index: src/effects/SkBlurMaskFilter.cpp
|
| diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
|
| index 123b9d28e5cce98c688775626a38609bde1e617c..b91192a6ba96b607faf0655ace10ad58ac58dabf 100644
|
| --- a/src/effects/SkBlurMaskFilter.cpp
|
| +++ b/src/effects/SkBlurMaskFilter.cpp
|
| @@ -563,8 +563,6 @@ public:
|
| typedef GrGLRectBlurEffect GLProcessor;
|
|
|
| virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE;
|
| - virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
|
| -
|
| /**
|
| * Create a simple filter effect with custom bicubic coefficients.
|
| */
|
| @@ -594,6 +592,9 @@ private:
|
| GrRectBlurEffect(const SkRect& rect, float sigma, GrTexture *blur_profile);
|
| virtual bool onIsEqual(const GrProcessor&) const SK_OVERRIDE;
|
|
|
| + virtual void onGetConstantColorComponents(GrColor* color, uint32_t* validFlags,
|
| + bool* isSingleComponent) const SK_OVERRIDE;
|
| +
|
| static bool CreateBlurProfileTexture(GrContext *context, float sigma,
|
| GrTexture **blurProfileTexture);
|
|
|
| @@ -765,9 +766,9 @@ bool GrRectBlurEffect::onIsEqual(const GrProcessor& sBase) const {
|
| return this->getSigma() == s.getSigma() && this->getRect() == s.getRect();
|
| }
|
|
|
| -void GrRectBlurEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
|
| +void GrRectBlurEffect::onGetConstantColorComponents(GrColor* color, uint32_t* validFlags,
|
| + bool* isSingleComponent) const {
|
| *validFlags = 0;
|
| - return;
|
| }
|
|
|
| GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrRectBlurEffect);
|
| @@ -837,8 +838,6 @@ public:
|
|
|
| typedef GrGLRRectBlurEffect GLProcessor;
|
|
|
| - virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
|
| -
|
| virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE;
|
|
|
| private:
|
| @@ -846,6 +845,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;
|
| float fSigma;
|
| GrTextureAccess fNinePatchAccess;
|
| @@ -929,7 +931,8 @@ GrFragmentProcessor* GrRRectBlurEffect::Create(GrContext* context, float sigma,
|
| return SkNEW_ARGS(GrRRectBlurEffect, (sigma, rrect, blurNinePatchTexture));
|
| }
|
|
|
| -void GrRRectBlurEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
|
| +void GrRRectBlurEffect::onGetConstantColorComponents(GrColor* color, uint32_t* validFlags,
|
| + bool* isSingleComponent) const {
|
| *validFlags = 0;
|
| }
|
|
|
|
|