From 3ed485f4249e17abb4b11f5018d03175fd1afb44 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 4 Oct 2016 21:35:32 +0000 Subject: Revert[5] "replace SkXfermode obj with SkBlendMode enum in paints" This reverts commit I0fa5c58af428f3da8565465d1219a34ef8417d9a. Reason for revert: failing to deserialize some of the 100K Original change's description: > Revert[4] "replace SkXfermode obj with SkBlendMode enum in paints" > > This reverts commit 2cbcd12281ee807214df094964c584c78932e10b. > > BUG=skia: > > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2924 > > Change-Id: I0fa5c58af428f3da8565465d1219a34ef8417d9a > Reviewed-on: https://skia-review.googlesource.com/2924 > Reviewed-by: Mike Reed > Commit-Queue: Mike Reed > TBR=reed@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I1805a57eef5ebcac203da5989c8539345ecf806f Reviewed-on: https://skia-review.googlesource.com/2962 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- tests/PaintTest.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'tests/PaintTest.cpp') diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index c4a4fb7721..f507467771 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.setBlendMode(SkBlendMode::kModulate); + paint.setXfermode(SkXfermode::Make(SkXfermode::kModulate_Mode)); paint.setLooper(nullptr); // Default value, ignored. SkBinaryWriteBuffer writer; @@ -311,11 +311,12 @@ DEF_TEST(Paint_MoreFlattening, r) { ASSERT(other.getTextScaleX() == paint.getTextScaleX()); ASSERT(other.getTextSize() == paint.getTextSize()); ASSERT(other.getLooper() == paint.getLooper()); - ASSERT(other.getBlendMode() == paint.getBlendMode()); -#ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR - other.setXfermode(nullptr); -#endif + // 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); } DEF_TEST(Paint_getHash, r) { @@ -354,11 +355,11 @@ DEF_TEST(Paint_nothingToDraw, r) { REPORTER_ASSERT(r, paint.nothingToDraw()); paint.setAlpha(0xFF); - paint.setBlendMode(SkBlendMode::kDst); + paint.setXfermodeMode(SkXfermode::kDst_Mode); REPORTER_ASSERT(r, paint.nothingToDraw()); paint.setAlpha(0); - paint.setBlendMode(SkBlendMode::kSrcOver); + paint.setXfermodeMode(SkXfermode::kSrcOver_Mode); SkColorMatrix cm; cm.setIdentity(); // does not change alpha -- cgit v1.2.3