diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-02-19 12:27:01 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-20 19:21:53 +0000 |
| commit | 8e1c4e672553ecae2745168514240705f3516773 (patch) | |
| tree | e6a30fef483a4701d7e4203129805880d79f4242 /include | |
| parent | a3091099fa19da32e60433c0da835e9de3dd8ee9 (diff) | |
Remove asTextureRef from SkSpecialImage & update effects accordingly (take 2)
This CL also renames SkSpecialImage::asTextureProxy to asTextureProxyRef
This is a reland of: https://skia-review.googlesource.com/c/7995/ (Remove asTextureRef from SkSpecialImage & update effects accordingly)
It should be good to land since https://skia-review.googlesource.com/c/8701/ (Replace SkSpecialImage::makeTightSubset with asImage (take 2)) fixes the Chrome-side issue
Change-Id: I3d88b2b3d23fd69f3fb914a69dacca96cbc038a4
Reviewed-on: https://skia-review.googlesource.com/8450
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/effects/SkMagnifierImageFilter.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h index b110dda087..84cc9db57d 100644 --- a/include/effects/SkMagnifierImageFilter.h +++ b/include/effects/SkMagnifierImageFilter.h @@ -14,7 +14,7 @@ class SK_API SkMagnifierImageFilter : public SkImageFilter { public: - static sk_sp<SkImageFilter> Make(const SkRect& src, SkScalar inset, + static sk_sp<SkImageFilter> Make(const SkRect& srcRect, SkScalar inset, sk_sp<SkImageFilter> input, const CropRect* cropRect = nullptr); @@ -32,8 +32,9 @@ protected: SkIPoint* offset) const override; private: - SkRect fSrcRect; + SkRect fSrcRect; SkScalar fInset; + typedef SkImageFilter INHERITED; }; |