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 /samplecode/SampleAll.cpp | |
| 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 'samplecode/SampleAll.cpp')
| -rw-r--r-- | samplecode/SampleAll.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index 70ecd9fe7e..b8b0ee677d 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -384,7 +384,7 @@ protected: SkMaskFilter* embossFilter = SkEmbossMaskFilter::Create(sigma, light); SkXfermode* xfermode = SkXfermode::Create(SkXfermode::kXor_Mode); - auto lightingFilter = SkColorMatrixFilter::MakeLightingFilter( + SkColorFilter* lightingFilter = SkColorMatrixFilter::CreateLightingFilter( 0xff89bc45, 0xff112233); canvas->save(); @@ -406,7 +406,7 @@ protected: paint.setStrokeWidth(SkIntToScalar(10)); paint.setStyle(SkPaint::kStroke_Style); paint.setXfermode(xfermode)->unref(); - paint.setColorFilter(lightingFilter); + paint.setColorFilter(lightingFilter)->unref(); canvas->drawLine(start.fX, start.fY, stop.fX, stop.fY, paint); // should not be green paint.setXfermode(nullptr); paint.setColorFilter(nullptr); @@ -543,9 +543,9 @@ protected: #if 01 int index = i % SK_ARRAY_COUNT(gLightingColors); - paint.setColorFilter(SkColorMatrixFilter::MakeLightingFilter( + paint.setColorFilter(SkColorMatrixFilter::CreateLightingFilter( gLightingColors[index].fMul, - gLightingColors[index].fAdd)); + gLightingColors[index].fAdd))->unref(); #endif canvas->drawText(str.c_str(), str.size(), x, y, paint); |