diff options
| author |  Mike Reed <reed@google.com> | 2018-02-22 13:41:39 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-22 19:09:10 +0000 |
| commit | 242135a402592e4fb40c5aba44cf8d483e68d292 (patch) | |
| tree | 04f98735331d03ffc00ad9f15c16cf3cc43e59cf /src/gpu/effects/GrRRectBlurEffect.cpp | |
| parent | 2c0349262132d6aa54ac6e8a4295f17c67e25907 (diff) | |
move some RRect methods into priv
also, return radii by value instead of reference, in possible prep for changing underlying representation
Bug: skia:7649
Change-Id: Iff42a49c53cc48171fc63462be366cc3500b2273
Reviewed-on: https://skia-review.googlesource.com/109385
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/effects/GrRRectBlurEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrRRectBlurEffect.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gpu/effects/GrRRectBlurEffect.cpp b/src/gpu/effects/GrRRectBlurEffect.cpp index e83ef17605..b307946d0c 100644 --- a/src/gpu/effects/GrRRectBlurEffect.cpp +++ b/src/gpu/effects/GrRRectBlurEffect.cpp @@ -15,10 +15,11 @@ std::unique_ptr<GrFragmentProcessor> GrRRectBlurEffect::Make(GrContext* context, float xformedSigma, const SkRRect& srcRRect, const SkRRect& devRRect) { - SkASSERT(!devRRect.isCircle() && !devRRect.isRect()); // Should've been caught up-stream + SkASSERT(!SkRRectPriv::IsCircle(devRRect) && + !devRRect.isRect()); // Should've been caught up-stream // TODO: loosen this up - if (!devRRect.isSimpleCircular()) { + if (!SkRRectPriv::IsSimpleCircular(devRRect)) { return nullptr; } @@ -44,8 +45,9 @@ std::unique_ptr<GrFragmentProcessor> GrRRectBlurEffect::Make(GrContext* context, return nullptr; } - return std::unique_ptr<GrFragmentProcessor>(new GrRRectBlurEffect( - xformedSigma, devRRect.getBounds(), devRRect.getSimpleRadii().fX, std::move(mask))); + return std::unique_ptr<GrFragmentProcessor>( + new GrRRectBlurEffect(xformedSigma, devRRect.getBounds(), + SkRRectPriv::GetSimpleRadii(devRRect).fX, std::move(mask))); } #include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" |