diff options
author | Mike Reed <reed@google.com> | 2016-10-28 15:42:34 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-28 20:06:17 +0000 |
commit | 7d954ad797176afedb9262fdea4507d0fc60eb9d (patch) | |
tree | 27c6dc324f83877371d91a58beb21e4b00176a94 /tests/ColorFilterTest.cpp | |
parent | 99e3f7d6fcb7b3b4340286455733a7de9eb4ef81 (diff) |
remove xfermode from public api
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4020
CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
Change-Id: I19cd056f2af778f10e8c6c2b7b2735593b43dbac
Reviewed-on: https://skia-review.googlesource.com/4020
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/ColorFilterTest.cpp')
-rw-r--r-- | tests/ColorFilterTest.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp index 9dfadbbb84..5d4ef86375 100644 --- a/tests/ColorFilterTest.cpp +++ b/tests/ColorFilterTest.cpp @@ -32,7 +32,7 @@ static sk_sp<SkColorFilter> reincarnate_colorfilter(SkFlattenable* obj) { static sk_sp<SkColorFilter> make_filter() { // pick a filter that cannot compose with itself via newComposed() - return SkColorFilter::MakeModeFilter(SK_ColorRED, SkXfermode::kColorBurn_Mode); + return SkColorFilter::MakeModeFilter(SK_ColorRED, SkBlendMode::kColorBurn); } static void test_composecolorfilter_limit(skiatest::Reporter* reporter) { @@ -50,43 +50,43 @@ static void test_composecolorfilter_limit(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, false); // we never saw a nullptr :( } -#define ILLEGAL_MODE ((SkXfermode::Mode)-1) +#define ILLEGAL_MODE ((SkBlendMode)-1) DEF_TEST(ColorFilter, reporter) { SkRandom rand; - for (int mode = 0; mode <= SkXfermode::kLastMode; mode++) { + for (int mode = 0; mode <= (int)SkBlendMode::kLastMode; mode++) { SkColor color = rand.nextU(); // ensure we always get a filter, by avoiding the possibility of a // 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); + auto cf = SkColorFilter::MakeModeFilter(color, (SkBlendMode)mode); // allow for no filter if we're in Dst mode (its a no op) - if (SkXfermode::kDst_Mode == mode && nullptr == cf) { + if (SkBlendMode::kDst == (SkBlendMode)mode && nullptr == cf) { continue; } REPORTER_ASSERT(reporter, cf); SkColor c = ~color; - SkXfermode::Mode m = ILLEGAL_MODE; + SkBlendMode m = ILLEGAL_MODE; SkColor expectedColor = color; - SkXfermode::Mode expectedMode = (SkXfermode::Mode)mode; + SkBlendMode expectedMode = (SkBlendMode)mode; // SkDebugf("--- mc [%d %x] ", mode, color); - REPORTER_ASSERT(reporter, cf->asColorMode(&c, &m)); + REPORTER_ASSERT(reporter, cf->asColorMode(&c, (SK_XFERMODE_MODE_PARAM*)&m)); // handle special-case folding by the factory - if (SkXfermode::kClear_Mode == mode) { + if (SkBlendMode::kClear == (SkBlendMode)mode) { if (c != expectedColor) { expectedColor = 0; } if (m != expectedMode) { - expectedMode = SkXfermode::kSrc_Mode; + expectedMode = SkBlendMode::kSrc; } } @@ -100,8 +100,8 @@ DEF_TEST(ColorFilter, reporter) { REPORTER_ASSERT(reporter, cf2); SkColor c2 = ~color; - SkXfermode::Mode m2 = ILLEGAL_MODE; - REPORTER_ASSERT(reporter, cf2->asColorMode(&c2, &m2)); + SkBlendMode m2 = ILLEGAL_MODE; + REPORTER_ASSERT(reporter, cf2->asColorMode(&c2, (SK_XFERMODE_MODE_PARAM*)&m2)); REPORTER_ASSERT(reporter, c2 == expectedColor); REPORTER_ASSERT(reporter, m2 == expectedMode); } |