From 0591897548c8fcb7d53cc94053e01702e58f1ac5 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 3 Oct 2016 12:57:32 -0400 Subject: replace SkXfermode obj with SkBlendMode enum in paints BUG=skia:5814 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2714 Change-Id: I4fb489ba6b3f77b458f7e4a99f79c7ad10859135 Reviewed-on: https://skia-review.googlesource.com/2714 Reviewed-by: Florin Malita Reviewed-by: Brian Salomon Commit-Queue: Mike Reed --- tests/PaintTest.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'tests/PaintTest.cpp') diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index f507467771..9cd9cfc63c 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -292,7 +292,7 @@ DEF_TEST(Paint_MoreFlattening, r) { paint.setColor(0x00AABBCC); paint.setTextScaleX(1.0f); // Default value, ignored. paint.setTextSize(19); - paint.setXfermode(SkXfermode::Make(SkXfermode::kModulate_Mode)); + paint.setBlendMode(SkBlendMode::kModulate); paint.setLooper(nullptr); // Default value, ignored. SkBinaryWriteBuffer writer; @@ -311,12 +311,7 @@ DEF_TEST(Paint_MoreFlattening, r) { ASSERT(other.getTextScaleX() == paint.getTextScaleX()); ASSERT(other.getTextSize() == paint.getTextSize()); ASSERT(other.getLooper() == paint.getLooper()); - - // We have to be a little looser and compare just the modes. Pointers might not be the same. - SkXfermode::Mode otherMode, paintMode; - ASSERT(other.getXfermode()->asMode(&otherMode)); - ASSERT(paint.getXfermode()->asMode(&paintMode)); - ASSERT(otherMode == paintMode); + ASSERT(other.getBlendMode() == paint.getBlendMode()); } DEF_TEST(Paint_getHash, r) { @@ -355,11 +350,11 @@ DEF_TEST(Paint_nothingToDraw, r) { REPORTER_ASSERT(r, paint.nothingToDraw()); paint.setAlpha(0xFF); - paint.setXfermodeMode(SkXfermode::kDst_Mode); + paint.setBlendMode(SkBlendMode::kDst); REPORTER_ASSERT(r, paint.nothingToDraw()); paint.setAlpha(0); - paint.setXfermodeMode(SkXfermode::kSrcOver_Mode); + paint.setBlendMode(SkBlendMode::kSrcOver); SkColorMatrix cm; cm.setIdentity(); // does not change alpha -- cgit v1.2.3