diff options
| author |  reed <reed@google.com> | 2016-04-03 09:11:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-03 09:11:13 -0700 |
| commit | 60c9b58b3214b0154c931656e91e39b230e987d8 (patch) | |
| tree | 6dd59cf90dd96a443a50ae4b6fa14be6f778c823 /include/core/SkFlattenable.h | |
| parent | cf9bafceafaf6c0bf8b0eac8de509aa1d8407fca (diff) | |
change flattenable factory to return sk_sp
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1855733002
Review URL: https://codereview.chromium.org/1855733002
Diffstat (limited to 'include/core/SkFlattenable.h')
| -rw-r--r-- | include/core/SkFlattenable.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h index 10cba1a2ec..c76f119c13 100644 --- a/include/core/SkFlattenable.h +++ b/include/core/SkFlattenable.h @@ -48,7 +48,7 @@ class SkPrivateEffectInitializer; #define SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(flattenable) \ private: \ - static SkFlattenable* CreateProc(SkReadBuffer&); \ + static sk_sp<SkFlattenable> CreateProc(SkReadBuffer&); \ friend class SkFlattenable::PrivateInitializer; \ public: \ Factory getFactory() const override { return CreateProc; } @@ -82,7 +82,7 @@ public: kSkXfermode_Type, }; - typedef SkFlattenable* (*Factory)(SkReadBuffer&); + typedef sk_sp<SkFlattenable> (*Factory)(SkReadBuffer&); SkFlattenable() {} |