diff options
| author |  reed <reed@google.com> | 2016-03-29 11:32:50 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-29 11:32:50 -0700 |
| commit | cfb6bdf767796c950f89985445738d2d8e7f12b0 (patch) | |
| tree | 5b412fe9d767eef852f55316a99eb9776751ccaf /tools/debugger | |
| parent | 3ebd2760dd34da6f5af23e9c7cb1b6a61e9cea9d (diff) | |
switch xfermodes over to sk_sp
waiting on https://codereview.chromium.org/1835163002/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1832223002
Review URL: https://codereview.chromium.org/1832223002
Diffstat (limited to 'tools/debugger')
| -rw-r--r-- | tools/debugger/SkDebugCanvas.cpp | 6 | ||||
| -rw-r--r-- | tools/debugger/SkDrawCommand.cpp | 3 | ||||
| -rw-r--r-- | tools/debugger/SkOverdrawMode.cpp | 2 | ||||
| -rw-r--r-- | tools/debugger/SkOverdrawMode.h | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/tools/debugger/SkDebugCanvas.cpp b/tools/debugger/SkDebugCanvas.cpp index cf3da5d21b..123b9b4aa8 100644 --- a/tools/debugger/SkDebugCanvas.cpp +++ b/tools/debugger/SkDebugCanvas.cpp @@ -33,7 +33,7 @@ public: bool overrideFilterQuality, SkFilterQuality quality) : INHERITED(width, height) - , fOverdrawXfermode(overdrawViz ? SkOverdrawMode::Create() : nullptr) + , fOverdrawXfermode(overdrawViz ? SkOverdrawMode::Make() : nullptr) , fOverrideFilterQuality(overrideFilterQuality) , fFilterQuality(quality) {} @@ -42,7 +42,7 @@ protected: if (*paint) { if (nullptr != fOverdrawXfermode.get()) { paint->writable()->setAntiAlias(false); - paint->writable()->setXfermode(fOverdrawXfermode.get()); + paint->writable()->setXfermode(fOverdrawXfermode); } if (fOverrideFilterQuality) { @@ -60,7 +60,7 @@ protected: } private: - SkAutoTUnref<SkXfermode> fOverdrawXfermode; + sk_sp<SkXfermode> fOverdrawXfermode; bool fOverrideFilterQuality; SkFilterQuality fFilterQuality; diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp index fcd2885828..a32e0b6211 100644 --- a/tools/debugger/SkDrawCommand.cpp +++ b/tools/debugger/SkDrawCommand.cpp @@ -1169,10 +1169,9 @@ static void extract_json_paint_xfermode(Json::Value& jsonPaint, UrlDataManager& SkPaint* target) { if (jsonPaint.isMember(SKDEBUGCANVAS_ATTRIBUTE_XFERMODE)) { Json::Value jsonXfermode = jsonPaint[SKDEBUGCANVAS_ATTRIBUTE_XFERMODE]; - SkXfermode* xfermode = (SkXfermode*) load_flattenable(jsonXfermode, urlDataManager); + sk_sp<SkXfermode> xfermode((SkXfermode*) load_flattenable(jsonXfermode, urlDataManager)); if (xfermode != nullptr) { target->setXfermode(xfermode); - xfermode->unref(); } } } diff --git a/tools/debugger/SkOverdrawMode.cpp b/tools/debugger/SkOverdrawMode.cpp index 3b695eca26..7eee387b09 100644 --- a/tools/debugger/SkOverdrawMode.cpp +++ b/tools/debugger/SkOverdrawMode.cpp @@ -317,7 +317,7 @@ SkFlattenable* SkOverdrawXfermode::CreateProc(SkReadBuffer& buffer) { return Create(); } -SkXfermode* SkOverdrawMode::Create() { return new SkOverdrawXfermode; } +sk_sp<SkXfermode> SkOverdrawMode::Make() { return sk_make_sp<SkOverdrawXfermode>(); } SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkOverdrawMode) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkOverdrawXfermode) diff --git a/tools/debugger/SkOverdrawMode.h b/tools/debugger/SkOverdrawMode.h index dba7635f6a..9e69293a93 100644 --- a/tools/debugger/SkOverdrawMode.h +++ b/tools/debugger/SkOverdrawMode.h @@ -14,7 +14,7 @@ class SkXfermode; class SkOverdrawMode { public: - static SkXfermode* Create(); + static sk_sp<SkXfermode> Make(); SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP(); |