diff options
author | Robert Phillips <robertphillips@google.com> | 2017-02-08 12:49:00 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-08 12:49:16 +0000 |
commit | 696b29346e85307a05af47768d358161eba3f6bd (patch) | |
tree | 2b488b37e0240e0176c539ad4efd4e25ca5bbd7d /include/effects | |
parent | 9852dc027f77c20640796d6988b0efcd42aa0b73 (diff) |
Revert "Remove asTextureRef from SkSpecialImage & update effects accordingly"
This reverts commit e88cf6b7aa5deaeaa9dab18ada7d9d11e1e4be12.
Reason for revert: See if breaking DEPS roll
Original change's description:
> Remove asTextureRef from SkSpecialImage & update effects accordingly
>
> This CL also renames SkSpecialImage::asTextureProxy to asTextureProxyRef
>
> Change-Id: I5ed8e475bb9688453b825ae4500ed0e8d324b5ac
> Reviewed-on: https://skia-review.googlesource.com/7995
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
>
TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I227cbd5fcaf7e2f86e858331d9ec7ff7a5f203ca
Reviewed-on: https://skia-review.googlesource.com/8184
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include/effects')
-rw-r--r-- | include/effects/SkMagnifierImageFilter.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h index 84cc9db57d..b110dda087 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& srcRect, SkScalar inset, + static sk_sp<SkImageFilter> Make(const SkRect& src, SkScalar inset, sk_sp<SkImageFilter> input, const CropRect* cropRect = nullptr); @@ -32,9 +32,8 @@ protected: SkIPoint* offset) const override; private: - SkRect fSrcRect; + SkRect fSrcRect; SkScalar fInset; - typedef SkImageFilter INHERITED; }; |