Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Unified Diff: include/core/SkImageFilter.h

Issue 1847583002: Update SkMergeImageFilter to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: update to To Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gm/testimagefilters.cpp ('k') | include/effects/SkMergeImageFilter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkImageFilter.h
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h
index d39d97857aeaf44669e7cb15c1a9e3f2f18201a6..d1b1483386bdd0c3378a16c50cd27e5e8e649c79 100644
--- a/include/core/SkImageFilter.h
+++ b/include/core/SkImageFilter.h
@@ -293,9 +293,6 @@ public:
protected:
class Common {
public:
- Common() {}
- ~Common();
-
/**
* Attempt to unflatten the cropRect and the expected number of input filters.
* If any number of input filters is valid, pass -1.
@@ -308,9 +305,9 @@ protected:
const CropRect& cropRect() const { return fCropRect; }
int inputCount() const { return fInputs.count(); }
- SkImageFilter** inputs() const { return fInputs.get(); }
+ sk_sp<SkImageFilter>* inputs() const { return fInputs.get(); }
- SkImageFilter* getInput(int index) const { return fInputs[index]; }
+ sk_sp<SkImageFilter> getInput(int index) const { return fInputs[index]; }
// If the caller wants a copy of the inputs, call this and it will transfer ownership
// of the unflattened input filters to the caller. This is just a short-cut for copying
@@ -321,7 +318,7 @@ protected:
private:
CropRect fCropRect;
// most filters accept at most 2 input-filters
- SkAutoSTArray<2, SkImageFilter*> fInputs;
+ SkAutoSTArray<2, sk_sp<SkImageFilter>> fInputs;
void allocInputs(int count);
};
« no previous file with comments | « gm/testimagefilters.cpp ('k') | include/effects/SkMergeImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698