diff options
| author |  robertphillips <robertphillips@google.com> | 2016-02-26 08:51:25 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-26 08:51:25 -0800 |
| commit | e8517147eee6b2bef299806ff4714d00907fc4f3 (patch) | |
| tree | 5103fe699348ef4142a447a3f9b8e9cbd6fd0894 | |
| parent | ee5348b069d53e5d843b2cebbac728ca7868d9fa (diff) | |
Make GrRRectBlurEffect::onIsEqual include the roundrect's rect
BUG=skia:5014
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1743553003
Review URL: https://codereview.chromium.org/1743553003
| -rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 1be030baf6..3eac76f3e1 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -1024,7 +1024,9 @@ GrRRectBlurEffect::GrRRectBlurEffect(float sigma, const SkRRect& rrect, GrTextur bool GrRRectBlurEffect::onIsEqual(const GrFragmentProcessor& other) const { const GrRRectBlurEffect& rrbe = other.cast<GrRRectBlurEffect>(); - return fRRect.getSimpleRadii().fX == rrbe.fRRect.getSimpleRadii().fX && fSigma == rrbe.fSigma; + return fRRect.getSimpleRadii().fX == rrbe.fRRect.getSimpleRadii().fX && + fSigma == rrbe.fSigma && + fRRect.rect() == rrbe.fRRect.rect(); } ////////////////////////////////////////////////////////////////////////////// @@ -1117,7 +1119,7 @@ void GrGLRRectBlurEffect::emitCode(EmitArgs& args) { void GrGLRRectBlurEffect::onSetData(const GrGLSLProgramDataManager& pdman, const GrProcessor& proc) { const GrRRectBlurEffect& brre = proc.cast<GrRRectBlurEffect>(); - SkRRect rrect = brre.getRRect(); + const SkRRect& rrect = brre.getRRect(); float blurRadius = 3.f*SkScalarCeilToScalar(brre.getSigma()-1/6.0f); pdman.set1f(fBlurRadiusUniform, blurRadius); |