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 /tests/ColorMatrixTest.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 'tests/ColorMatrixTest.cpp')
| -rw-r--r-- | tests/ColorMatrixTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ColorMatrixTest.cpp b/tests/ColorMatrixTest.cpp index 7919b40242..1eea4f5a9d 100644 --- a/tests/ColorMatrixTest.cpp +++ b/tests/ColorMatrixTest.cpp @@ -45,7 +45,7 @@ static inline void test_colorMatrixCTS(skiatest::Reporter* reporter) { 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f }; - paint.setColorFilter(SkColorFilter::MakeMatrixFilterRowMajor255(blueToCyan)); + paint.setColorFilter(SkColorMatrixFilter::Create(blueToCyan))->unref(); paint.setColor(SK_ColorBLUE); canvas.drawPoint(0, 0, paint); @@ -70,7 +70,7 @@ static inline void test_colorMatrixCTS(skiatest::Reporter* reporter) { 0.0f, 0.0f, 1.0f, 0.0f, 64.0f, -0.5f, 0.0f, 0.0f, 1.0f, 0.0f }; - paint.setColorFilter(SkColorFilter::MakeMatrixFilterRowMajor255(transparentRedAddBlue)); + paint.setColorFilter(SkColorMatrixFilter::Create(transparentRedAddBlue))->unref(); bitmap.eraseColor(SK_ColorTRANSPARENT); paint.setColor(SK_ColorRED); @@ -91,7 +91,7 @@ static inline void test_colorMatrixCTS(skiatest::Reporter* reporter) { assert_color(reporter, SK_ColorCYAN, bitmap.getColor(0, 0)); // create a new filter with the changed matrix - paint.setColorFilter(SkColorFilter::MakeMatrixFilterRowMajor255(transparentRedAddBlue)); + paint.setColorFilter(SkColorMatrixFilter::Create(transparentRedAddBlue))->unref(); canvas.drawPoint(0, 0, paint); assert_color(reporter, SK_ColorBLUE, bitmap.getColor(0, 0)); } |