diff options
| author |  reed <reed@google.com> | 2016-03-22 08:59:19 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-22 08:59:19 -0700 |
| commit | d6889293dd0942f27f9593f679722c956831f2c4 (patch) | |
| tree | e7c4f9aa9ee2c4e318e8e5c8d69f6918fba1e865 /tools/debugger | |
| parent | 1088db92348baa013511a49392178fccf03e8008 (diff) | |
Revert of Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o… (patchset #3 id:40001 of https://codereview.chromium.org/1825073002/ )
Reason for revert:
CreateModeFilter not compiling
Original issue's description:
> Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )"
>
> Fixed legacy withColorFilter to call new(er) make method
>
> This reverts commit 1eb81db650d31f50be67b12d60c4f9e7dd08432f.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1825073002
>
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/4c9776b046dd5e9e46e2d1ce35154855c8fcb381
TBR=
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1821103004
Diffstat (limited to 'tools/debugger')
| -rw-r--r-- | tools/debugger/SkDrawCommand.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp index 5dc6079897..5bacf02b1a 100644 --- a/tools/debugger/SkDrawCommand.cpp +++ b/tools/debugger/SkDrawCommand.cpp @@ -1159,10 +1159,11 @@ 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]; - sk_sp<SkColorFilter> colorFilter((SkColorFilter*)load_flattenable(jsonColorFilter, - urlDataManager)); + SkColorFilter* colorFilter = (SkColorFilter*) load_flattenable(jsonColorFilter, + urlDataManager); if (colorFilter != nullptr) { target->setColorFilter(colorFilter); + colorFilter->unref(); } } } |