diff options
| author |  Mike Reed <reed@google.com> | 2018-01-20 22:24:21 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-20 22:24:31 +0000 |
| commit | bfadcf0224cb22e2aec10592fa197ba7ab19b479 (patch) | |
| tree | c3a3635a542239a30928855e6b322c36b91c96ba /src/effects/SkRRectsGaussianEdgeMaskFilter.cpp | |
| parent | 2914555e004676465c5255d8b42ee0d25887ac73 (diff) | |
Revert "Revert "use GrFPArgs for maskfilters""
This reverts commit 4f7f197c09443232f02cd81f3ac7fb5a216acd05.
Reason for revert: not needed for roll
Original change's description:
> Revert "use GrFPArgs for maskfilters"
>
> This reverts commit a99b39399522658d7e5ddee97d0e45aa9fceaf89.
>
> Reason for revert: try to unblock android roller
>
> Original change's description:
> > use GrFPArgs for maskfilters
> >
> > Bug: skia:
> > Change-Id: I8516a3b0f6d8301c51f0861c65b9fe8f692fc5e5
> > Reviewed-on: https://skia-review.googlesource.com/97260
> > Commit-Queue: Mike Reed <reed@google.com>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
>
> TBR=egdaniel@google.com,bsalomon@google.com,reed@google.com
>
> Change-Id: Iefe8ed19bba75df86173dec53f5ed4f1ea8724d0
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/97581
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,reed@google.com
Change-Id: I82c0e3234ff1b23c6d08259aae7dcb03087a415e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/97583
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/effects/SkRRectsGaussianEdgeMaskFilter.cpp')
| -rw-r--r-- | src/effects/SkRRectsGaussianEdgeMaskFilter.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/effects/SkRRectsGaussianEdgeMaskFilter.cpp b/src/effects/SkRRectsGaussianEdgeMaskFilter.cpp index 27bf09fd7c..09739c0813 100644 --- a/src/effects/SkRRectsGaussianEdgeMaskFilter.cpp +++ b/src/effects/SkRRectsGaussianEdgeMaskFilter.cpp @@ -32,16 +32,17 @@ public: bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&, SkIPoint* margin) const override; -#if SK_SUPPORT_GPU - bool asFragmentProcessor(GrFragmentProcessor**) const override; -#endif - SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRRectsGaussianEdgeMaskFilterImpl) protected: void flatten(SkWriteBuffer&) const override; +#if SK_SUPPORT_GPU + std::unique_ptr<GrFragmentProcessor> onAsFragmentProcessor(const GrFPArgs& args) const override; + bool onHasFragmentProcessor() const override { return true; } +#endif + private: SkRRect fFirst; SkRRect fSecond; @@ -509,12 +510,10 @@ private: }; //////////////////////////////////////////////////////////////////////////// -bool SkRRectsGaussianEdgeMaskFilterImpl::asFragmentProcessor(GrFragmentProcessor** fp) const { - if (fp) { - *fp = RRectsGaussianEdgeFP::Make(fFirst, fSecond, fRadius).release(); - } - return true; +std::unique_ptr<GrFragmentProcessor> +SkRRectsGaussianEdgeMaskFilterImpl::onAsFragmentProcessor(const GrFPArgs& args) const { + return RRectsGaussianEdgeFP::Make(fFirst, fSecond, fRadius); } #endif |