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/LayerDrawLooperTest.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tests/LayerDrawLooperTest.cpp') diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp index 4897fd2884..8ba290fbdf 100644 --- a/tests/LayerDrawLooperTest.cpp +++ b/tests/LayerDrawLooperTest.cpp @@ -53,7 +53,7 @@ static void test_frontToBack(skiatest::Reporter* reporter) { layerInfo.fOffset.set(10.0f, 20.0f); layerInfo.fPaintBits |= SkLayerDrawLooper::kXfermode_Bit; SkPaint* layerPaint = looperBuilder.addLayer(layerInfo); - layerPaint->setBlendMode(SkBlendMode::kSrc); + layerPaint->setXfermodeMode(SkXfermode::kSrc_Mode); FakeDevice device; SkCanvas canvas(&device); @@ -65,7 +65,7 @@ static void test_frontToBack(skiatest::Reporter* reporter) { // The back layer should come first. REPORTER_ASSERT(reporter, context->next(&canvas, &paint)); - REPORTER_ASSERT(reporter, paint.getBlendMode() == SkBlendMode::kSrc); + REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrc_Mode)); canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint); REPORTER_ASSERT(reporter, 10.0f == device.fLastMatrix.getTranslateX()); REPORTER_ASSERT(reporter, 20.0f == device.fLastMatrix.getTranslateY()); @@ -73,7 +73,7 @@ static void test_frontToBack(skiatest::Reporter* reporter) { // Then the front layer. REPORTER_ASSERT(reporter, context->next(&canvas, &paint)); - REPORTER_ASSERT(reporter, paint.getBlendMode() == SkBlendMode::kSrcOver); + REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)); canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint); REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateX()); REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateY()); @@ -93,7 +93,7 @@ static void test_backToFront(skiatest::Reporter* reporter) { layerInfo.fOffset.set(10.0f, 20.0f); layerInfo.fPaintBits |= SkLayerDrawLooper::kXfermode_Bit; SkPaint* layerPaint = looperBuilder.addLayerOnTop(layerInfo); - layerPaint->setBlendMode(SkBlendMode::kSrc); + layerPaint->setXfermodeMode(SkXfermode::kSrc_Mode); FakeDevice device; SkCanvas canvas(&device); @@ -105,7 +105,7 @@ static void test_backToFront(skiatest::Reporter* reporter) { // The back layer should come first. REPORTER_ASSERT(reporter, context->next(&canvas, &paint)); - REPORTER_ASSERT(reporter, paint.getBlendMode() == SkBlendMode::kSrcOver); + REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)); canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint); REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateX()); REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateY()); @@ -113,7 +113,7 @@ static void test_backToFront(skiatest::Reporter* reporter) { // Then the front layer. REPORTER_ASSERT(reporter, context->next(&canvas, &paint)); - REPORTER_ASSERT(reporter, paint.getBlendMode() == SkBlendMode::kSrc); + REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrc_Mode)); canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint); REPORTER_ASSERT(reporter, 10.0f == device.fLastMatrix.getTranslateX()); REPORTER_ASSERT(reporter, 20.0f == device.fLastMatrix.getTranslateY()); @@ -133,7 +133,7 @@ static void test_mixed(skiatest::Reporter* reporter) { layerInfo.fOffset.set(10.0f, 20.0f); layerInfo.fPaintBits |= SkLayerDrawLooper::kXfermode_Bit; SkPaint* layerPaint = looperBuilder.addLayerOnTop(layerInfo); - layerPaint->setBlendMode(SkBlendMode::kSrc); + layerPaint->setXfermodeMode(SkXfermode::kSrc_Mode); FakeDevice device; SkCanvas canvas(&device); @@ -145,7 +145,7 @@ static void test_mixed(skiatest::Reporter* reporter) { // The back layer should come first. REPORTER_ASSERT(reporter, context->next(&canvas, &paint)); - REPORTER_ASSERT(reporter, paint.getBlendMode() == SkBlendMode::kSrcOver); + REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)); canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint); REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateX()); REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateY()); @@ -153,7 +153,7 @@ static void test_mixed(skiatest::Reporter* reporter) { // Then the front layer. REPORTER_ASSERT(reporter, context->next(&canvas, &paint)); - REPORTER_ASSERT(reporter, paint.getBlendMode() == SkBlendMode::kSrc); + REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrc_Mode)); canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint); REPORTER_ASSERT(reporter, 10.0f == device.fLastMatrix.getTranslateX()); REPORTER_ASSERT(reporter, 20.0f == device.fLastMatrix.getTranslateY()); -- cgit v1.2.3