commit | d053ce9c54d4e5937a142278359e5a4cde18095e | [log] [tgz] |
---|---|---|
author | reed <reed@google.com> | Tue Mar 22 10:17:23 2016 -0700 |
committer | Commit bot <commit-bot@chromium.org> | Tue Mar 22 10:17:23 2016 -0700 |
tree | e85d4b9d8b23f4fc3c04e6a72173d363ba5f69d5 | |
parent | d25d06bf5f109c429e59a41d11854d2a3835abe9 [diff] |
Reland of [2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o… (patchset #1 id:1 of https://codereview.chromium.org/1821103004/ ) Reason for revert: guard has now landed in chrome Original issue's description: > 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: > > Committed: https://skia.googlesource.com/skia/+/d6889293dd0942f27f9593f679722c956831f2c4 TBR= # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=skia: Review URL: https://codereview.chromium.org/1827433002
diff --git a/tools/android/SkAndroidSDKCanvas.cpp b/tools/android/SkAndroidSDKCanvas.cpp index 35b1581..d7a76ca 100644 --- a/tools/android/SkAndroidSDKCanvas.cpp +++ b/tools/android/SkAndroidSDKCanvas.cpp
@@ -69,7 +69,7 @@ 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 5bacf02..5dc6079 100644 --- a/tools/debugger/SkDrawCommand.cpp +++ b/tools/debugger/SkDrawCommand.cpp
@@ -1159,11 +1159,10 @@ 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(); } } }