aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
authorGravatar djsollen <djsollen@google.com>2016-03-29 19:07:07 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-29 19:07:07 -0700
commit890579051d4096a8f769eadb9cde3f931d7abd7c (patch)
tree3c683bc8f4fc81d6b48fbf763c50540c39a64098 /include/core
parent308d988cba909ffbb456d4f327820a57df0d1d51 (diff)
Revert of Switch SkLocalMatrixImageFilter and SkPaintImageFilter over to sk_sp (patchset #6 id:100001 of https://codereview.chromium.org/1842793002/ )
Reason for revert: This CL is causing the autoroll into Chromium & google3 to fail. Original issue's description: > Switch SkLocalMatrixImageFilter and SkPaintImageFilter over to sk_sp > > TBR=reed@google.com > > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1842793002 > > Committed: https://skia.googlesource.com/skia/+/a33cf07a2273315363c0b6fb5d3ce811742f5a85 TBR=fmalita@chromium.org,reed@google.com,robertphillips@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1837293003
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkImageFilter.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h
index f4273cb8da..ab72547fed 100644
--- a/include/core/SkImageFilter.h
+++ b/include/core/SkImageFilter.h
@@ -255,13 +255,7 @@ public:
* If this filter can be represented by another filter + a localMatrix, return that filter,
* else return null.
*/
- sk_sp<SkImageFilter> makeWithLocalMatrix(const SkMatrix&) const;
-
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
- SkImageFilter* newWithLocalMatrix(const SkMatrix& matrix) const {
- this->makeWithLocalMatrix(matrix).release();
- }
-#endif
+ SkImageFilter* newWithLocalMatrix(const SkMatrix& matrix) const;
/**
* Create an SkMatrixImageFilter, which transforms its input by the given matrix.
@@ -326,9 +320,7 @@ protected:
void allocInputs(int count);
};
- SkImageFilter(int inputCount, SkImageFilter** inputs, const CropRect* cropRect = nullptr);
-
- SkImageFilter(sk_sp<SkImageFilter>* inputs, int inputCount, const CropRect* cropRect);
+ SkImageFilter(int inputCount, SkImageFilter** inputs, const CropRect* cropRect = NULL);
virtual ~SkImageFilter();