| Index: src/effects/SkBlurMaskFilter.cpp
|
| diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
|
| index 251398ca5b64b2d1515c9129d929d43d2a135f5a..123b9d28e5cce98c688775626a38609bde1e617c 100644
|
| --- a/src/effects/SkBlurMaskFilter.cpp
|
| +++ b/src/effects/SkBlurMaskFilter.cpp
|
| @@ -563,6 +563,8 @@
|
| 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.
|
| */
|
| @@ -591,8 +593,6 @@
|
| private:
|
| GrRectBlurEffect(const SkRect& rect, float sigma, GrTexture *blur_profile);
|
| virtual bool onIsEqual(const GrProcessor&) const SK_OVERRIDE;
|
| -
|
| - virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE;
|
|
|
| static bool CreateBlurProfileTexture(GrContext *context, float sigma,
|
| GrTexture **blurProfileTexture);
|
| @@ -765,9 +765,9 @@
|
| return this->getSigma() == s.getSigma() && this->getRect() == s.getRect();
|
| }
|
|
|
| -void GrRectBlurEffect::onComputeInvariantOutput(InvariantOutput* inout) const {
|
| - inout->fValidFlags = 0;
|
| - inout->fIsSingleComponent = false;
|
| +void GrRectBlurEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
|
| + *validFlags = 0;
|
| + return;
|
| }
|
|
|
| GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrRectBlurEffect);
|
| @@ -837,14 +837,14 @@
|
|
|
| typedef GrGLRRectBlurEffect GLProcessor;
|
|
|
| + virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
|
| +
|
| virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE;
|
|
|
| private:
|
| GrRRectBlurEffect(float sigma, const SkRRect&, GrTexture* profileTexture);
|
|
|
| virtual bool onIsEqual(const GrProcessor& other) const SK_OVERRIDE;
|
| -
|
| - virtual void onComputeInvariantOutput(InvariantOutput* inout) const SK_OVERRIDE;
|
|
|
| SkRRect fRRect;
|
| float fSigma;
|
| @@ -929,9 +929,8 @@
|
| return SkNEW_ARGS(GrRRectBlurEffect, (sigma, rrect, blurNinePatchTexture));
|
| }
|
|
|
| -void GrRRectBlurEffect::onComputeInvariantOutput(InvariantOutput* inout) const {
|
| - inout->fValidFlags = 0;
|
| - inout->fIsSingleComponent = false;
|
| +void GrRRectBlurEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const {
|
| + *validFlags = 0;
|
| }
|
|
|
| const GrBackendFragmentProcessorFactory& GrRRectBlurEffect::getFactory() const {
|
|
|