diff options
| author |  Mike Reed <reed@google.com> | 2016-10-04 10:06:20 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-04 20:09:34 +0000 |
| commit | 1834242ec6e3cd62669227d394bc79e1cd66dcfb (patch) | |
| tree | c956e75f272619b5901ca0beab31dbf4a50d9974 /tests/LayerDrawLooperTest.cpp | |
| parent | 6942442ef7cc018ac136dd379ad6a30902a060e5 (diff) | |
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 <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/LayerDrawLooperTest.cpp')
| -rw-r--r-- | tests/LayerDrawLooperTest.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp index 8ba290fbdf..4897fd2884 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->setXfermodeMode(SkXfermode::kSrc_Mode); + layerPaint->setBlendMode(SkBlendMode::kSrc); 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, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrc_Mode)); + REPORTER_ASSERT(reporter, paint.getBlendMode() == SkBlendMode::kSrc); 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, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)); + REPORTER_ASSERT(reporter, paint.getBlendMode() == SkBlendMode::kSrcOver); 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->setXfermodeMode(SkXfermode::kSrc_Mode); + layerPaint->setBlendMode(SkBlendMode::kSrc); 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, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)); + REPORTER_ASSERT(reporter, paint.getBlendMode() == SkBlendMode::kSrcOver); 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, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrc_Mode)); + REPORTER_ASSERT(reporter, paint.getBlendMode() == SkBlendMode::kSrc); 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->setXfermodeMode(SkXfermode::kSrc_Mode); + layerPaint->setBlendMode(SkBlendMode::kSrc); 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, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode)); + REPORTER_ASSERT(reporter, paint.getBlendMode() == SkBlendMode::kSrcOver); 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, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrc_Mode)); + REPORTER_ASSERT(reporter, paint.getBlendMode() == SkBlendMode::kSrc); 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()); |