diff options
author | 2016-04-03 09:11:13 -0700 | |
---|---|---|
committer | 2016-04-03 09:11:13 -0700 | |
commit | 60c9b58b3214b0154c931656e91e39b230e987d8 (patch) | |
tree | 6dd59cf90dd96a443a50ae4b6fa14be6f778c823 /tools/debugger | |
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 'tools/debugger')
-rw-r--r-- | tools/debugger/SkDrawCommand.cpp | 4 | ||||
-rw-r--r-- | tools/debugger/SkOverdrawMode.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp index a32e0b6211..d868418d54 100644 --- a/tools/debugger/SkDrawCommand.cpp +++ b/tools/debugger/SkDrawCommand.cpp @@ -726,12 +726,12 @@ static SkFlattenable* load_flattenable(Json::Value jsonFlattenable, const void* data; int size = decode_data(jsonFlattenable[SKDEBUGCANVAS_ATTRIBUTE_DATA], urlDataManager, &data); SkValidatingReadBuffer buffer(data, size); - SkFlattenable* result = factory(buffer); + sk_sp<SkFlattenable> result = factory(buffer); if (!buffer.isValid()) { SkDebugf("invalid buffer loading flattenable\n"); return nullptr; } - return result; + return result.release(); } static SkColorType colortype_from_name(const char* name) { diff --git a/tools/debugger/SkOverdrawMode.cpp b/tools/debugger/SkOverdrawMode.cpp index 7eee387b09..1e018babdb 100644 --- a/tools/debugger/SkOverdrawMode.cpp +++ b/tools/debugger/SkOverdrawMode.cpp @@ -313,8 +313,8 @@ private: typedef SkXfermode INHERITED; }; -SkFlattenable* SkOverdrawXfermode::CreateProc(SkReadBuffer& buffer) { - return Create(); +sk_sp<SkFlattenable> SkOverdrawXfermode::CreateProc(SkReadBuffer& buffer) { + return sk_sp<SkFlattenable>(Create()); } sk_sp<SkXfermode> SkOverdrawMode::Make() { return sk_make_sp<SkOverdrawXfermode>(); } |