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/ColorFilterTest.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/ColorFilterTest.cpp')
-rw-r--r-- | tests/ColorFilterTest.cpp | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp index 822fb0bd70..ee8f12b2fb 100644 --- a/tests/ColorFilterTest.cpp +++ b/tests/ColorFilterTest.cpp @@ -15,7 +15,7 @@ #include "SkXfermode.h" #include "Test.h" -static sk_sp<SkColorFilter> reincarnate_colorfilter(SkFlattenable* obj) { +static SkColorFilter* reincarnate_colorfilter(SkFlattenable* obj) { SkWriteBuffer wb; wb.writeFlattenable(obj); @@ -30,18 +30,18 @@ static sk_sp<SkColorFilter> reincarnate_colorfilter(SkFlattenable* obj) { /////////////////////////////////////////////////////////////////////////////// -static sk_sp<SkColorFilter> make_filter() { +static SkColorFilter* make_filter() { // pick a filter that cannot compose with itself via newComposed() - return SkColorFilter::MakeModeFilter(SK_ColorRED, SkXfermode::kColorBurn_Mode); + return SkColorFilter::CreateModeFilter(SK_ColorRED, SkXfermode::kColorBurn_Mode); } static void test_composecolorfilter_limit(skiatest::Reporter* reporter) { // Test that CreateComposeFilter() has some finite limit (i.e. that the factory can return null) const int way_too_many = 100; - auto parent(make_filter()); + SkAutoTUnref<SkColorFilter> parent(make_filter()); for (int i = 2; i < way_too_many; ++i) { - auto filter(make_filter()); - parent = SkColorFilter::MakeComposeFilter(parent, filter); + SkAutoTUnref<SkColorFilter> filter(make_filter()); + parent.reset(SkColorFilter::CreateComposeFilter(parent, filter)); if (nullptr == parent) { REPORTER_ASSERT(reporter, i > 2); // we need to have succeeded at least once! return; @@ -62,13 +62,15 @@ DEF_TEST(ColorFilter, reporter) { // special case that would return nullptr (if color's alpha is 0 or 0xFF) color = SkColorSetA(color, 0x7F); - auto cf = SkColorFilter::MakeModeFilter(color, (SkXfermode::Mode)mode); + SkColorFilter* cf = SkColorFilter::CreateModeFilter(color, + (SkXfermode::Mode)mode); // allow for no filter if we're in Dst mode (its a no op) if (SkXfermode::kDst_Mode == mode && nullptr == cf) { continue; } + SkAutoUnref aur(cf); REPORTER_ASSERT(reporter, cf); SkColor c = ~color; @@ -96,7 +98,8 @@ DEF_TEST(ColorFilter, reporter) { REPORTER_ASSERT(reporter, m == expectedMode); { - auto cf2 = reincarnate_colorfilter(cf.get()); + SkColorFilter* cf2 = reincarnate_colorfilter(cf); + SkAutoUnref aur2(cf2); REPORTER_ASSERT(reporter, cf2); SkColor c2 = ~color; @@ -114,7 +117,7 @@ DEF_TEST(ColorFilter, reporter) { DEF_TEST(LumaColorFilter, reporter) { SkPMColor in, out; - auto lf(SkLumaColorFilter::Make()); + SkAutoTUnref<SkColorFilter> lf(SkLumaColorFilter::Create()); // Applying luma to white produces black with the same transparency. for (unsigned i = 0; i < 256; ++i) { @@ -180,31 +183,31 @@ static void get_grayscale_matrix(float amount, float matrix[20]) { matrix[18] = 1.f; } -static sk_sp<SkColorFilter> make_cf0() { +static SkColorFilter* make_cf0() { SkScalar matrix[20]; get_brightness_matrix(0.5f, matrix); - return SkColorFilter::MakeMatrixFilterRowMajor255(matrix); + return SkColorMatrixFilter::Create(matrix); } -static sk_sp<SkColorFilter> make_cf1() { +static SkColorFilter* make_cf1() { SkScalar matrix[20]; get_grayscale_matrix(1, matrix); - return SkColorFilter::MakeMatrixFilterRowMajor255(matrix); + return SkColorMatrixFilter::Create(matrix); } -static sk_sp<SkColorFilter> make_cf2() { +static SkColorFilter* make_cf2() { SkColorMatrix m0, m1; get_brightness_matrix(0.5f, m0.fMat); get_grayscale_matrix(1, m1.fMat); m0.preConcat(m1); - return SkColorFilter::MakeMatrixFilterRowMajor255(m0.fMat); + return SkColorMatrixFilter::Create(m0); } -static sk_sp<SkColorFilter> make_cf3() { +static SkColorFilter* make_cf3() { SkColorMatrix m0, m1; get_brightness_matrix(0.5f, m0.fMat); get_grayscale_matrix(1, m1.fMat); m0.postConcat(m1); - return SkColorFilter::MakeMatrixFilterRowMajor255(m0.fMat); + return SkColorMatrixFilter::Create(m0); } -typedef sk_sp<SkColorFilter> (*CFProc)(); +typedef SkColorFilter* (*CFProc)(); // Test that a colormatrix that "should" preserve opaquness actually does. DEF_TEST(ColorMatrixFilter, reporter) { @@ -213,7 +216,7 @@ DEF_TEST(ColorMatrixFilter, reporter) { }; for (size_t i = 0; i < SK_ARRAY_COUNT(procs); ++i) { - auto cf(procs[i]()); + SkAutoTUnref<SkColorFilter> cf(procs[i]()); // generate all possible r,g,b triples for (int r = 0; r < 256; ++r) { |