diff options
| author |  reed <reed@google.com> | 2016-03-22 07:23:24 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-22 07:23:24 -0700 |
| commit | f809d7687a4fb7b88b651b046da2bc0035d6aa09 (patch) | |
| tree | 38fa4182df2c735459e43b0eaaa073c1ef8c612d /tools | |
| parent | cfcd1819d1431bbe5812c174fc337d3678d63f06 (diff) | |
switch colorfilters to sk_sp
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1822623002
Review URL: https://codereview.chromium.org/1822623002
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/SkAndroidSDKCanvas.cpp | 2 | ||||
| -rw-r--r-- | tools/debugger/SkDrawCommand.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/android/SkAndroidSDKCanvas.cpp b/tools/android/SkAndroidSDKCanvas.cpp index 35b1581fda..d7a76ca215 100644 --- a/tools/android/SkAndroidSDKCanvas.cpp +++ b/tools/android/SkAndroidSDKCanvas.cpp @@ -69,7 +69,7 @@ void Filter(SkPaint* paint) { bool isMode = cf->asColorMode(&color, &mode); if (isMode && mode > SkXfermode::kLighten_Mode) { paint->setColorFilter( - SkColorFilter::CreateModeFilter(color, SkXfermode::kSrcOver_Mode)); + SkColorFilter::MakeModeFilter(color, SkXfermode::kSrcOver_Mode)); } else if (!isMode && !cf->asColorMatrix(srcColorMatrix)) { paint->setColorFilter(nullptr); } diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp index 5bacf02b1a..5dc6079897 100644 --- a/tools/debugger/SkDrawCommand.cpp +++ b/tools/debugger/SkDrawCommand.cpp @@ -1159,11 +1159,10 @@ static void extract_json_paint_colorfilter(Json::Value& jsonPaint, UrlDataManage SkPaint* target) { if (jsonPaint.isMember(SKDEBUGCANVAS_ATTRIBUTE_COLORFILTER)) { Json::Value jsonColorFilter = jsonPaint[SKDEBUGCANVAS_ATTRIBUTE_COLORFILTER]; - SkColorFilter* colorFilter = (SkColorFilter*) load_flattenable(jsonColorFilter, - urlDataManager); + sk_sp<SkColorFilter> colorFilter((SkColorFilter*)load_flattenable(jsonColorFilter, + urlDataManager)); if (colorFilter != nullptr) { target->setColorFilter(colorFilter); - colorFilter->unref(); } } } |