diff options
| author |  reed <reed@google.com> | 2016-03-22 07:35:17 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-22 07:35:17 -0700 |
| commit | 1eb81db650d31f50be67b12d60c4f9e7dd08432f (patch) | |
| tree | 58a5fd565f06a398192be170009fefa2a12a1ee2 /tools | |
| parent | ee451cf09de31267c93b64e1fdac7c823cee7e85 (diff) | |
Revert of switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )
Reason for revert:
need to fix unguarded makeWithFilter
Original issue's description:
> 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
>
> Committed: https://skia.googlesource.com/skia/+/f809d7687a4fb7b88b651b046da2bc0035d6aa09
TBR=fmalita@chromium.org
# 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/1820303002
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/SkAndroidSDKCanvas.cpp | 2 | ||||
| -rw-r--r-- | tools/debugger/SkDrawCommand.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/android/SkAndroidSDKCanvas.cpp b/tools/android/SkAndroidSDKCanvas.cpp index d7a76ca215..35b1581fda 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::MakeModeFilter(color, SkXfermode::kSrcOver_Mode)); + SkColorFilter::CreateModeFilter(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 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(); } } } |