From 70cdb396eb5ffbbed128b902532e9292b5ec0e9d Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 3 Oct 2016 15:44:23 -0400 Subject: Revert "Revert "replace SkXfermode obj with SkBlendMode enum in paints"" This reverts commit ce02e7175872abde3721df9e5d3ec0ab8384cd8e. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2878 Change-Id: I86875511a13497112827cbaed1dbd7639e9e3d10 Reviewed-on: https://skia-review.googlesource.com/2878 Reviewed-by: Matt Sarett Commit-Queue: Mike Reed --- tests/PDFOpaqueSrcModeToSrcOverTest.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/PDFOpaqueSrcModeToSrcOverTest.cpp') diff --git a/tests/PDFOpaqueSrcModeToSrcOverTest.cpp b/tests/PDFOpaqueSrcModeToSrcOverTest.cpp index 76796f5500..e15234d090 100644 --- a/tests/PDFOpaqueSrcModeToSrcOverTest.cpp +++ b/tests/PDFOpaqueSrcModeToSrcOverTest.cpp @@ -9,14 +9,14 @@ #include "SkStream.h" #include "Test.h" -static void run_test(SkWStream* out, SkXfermode::Mode mode, U8CPU alpha) { +static void run_test(SkWStream* out, SkBlendMode mode, U8CPU alpha) { sk_sp pdfDoc(SkDocument::MakePDF(out)); SkCanvas* c = pdfDoc->beginPage(612.0f, 792.0f); SkPaint black; SkPaint background; background.setColor(SK_ColorWHITE); background.setAlpha(alpha); - background.setXfermodeMode(mode); + background.setBlendMode(mode); c->drawRect(SkRect::MakeWH(612.0f, 792.0f), background); c->drawRect(SkRect::MakeXYWH(36.0f, 36.0f, 9.0f, 9.0f), black); c->drawRect(SkRect::MakeXYWH(72.0f, 72.0f, 468.0f, 648.0f), background); @@ -31,8 +31,8 @@ DEF_TEST(SkPDF_OpaqueSrcModeToSrcOver, r) { SkDynamicMemoryWStream srcOverMode; U8CPU alpha = SK_AlphaOPAQUE; - run_test(&srcMode, SkXfermode::kSrc_Mode, alpha); - run_test(&srcOverMode, SkXfermode::kSrcOver_Mode, alpha); + run_test(&srcMode, SkBlendMode::kSrc, alpha); + run_test(&srcOverMode, SkBlendMode::kSrcOver, alpha); REPORTER_ASSERT(r, srcMode.getOffset() == srcOverMode.getOffset()); // The two PDFs should be equal because they have an opaque alpha. @@ -40,8 +40,8 @@ DEF_TEST(SkPDF_OpaqueSrcModeToSrcOver, r) { srcOverMode.reset(); alpha = 0x80; - run_test(&srcMode, SkXfermode::kSrc_Mode, alpha); - run_test(&srcOverMode, SkXfermode::kSrcOver_Mode, alpha); + run_test(&srcMode, SkBlendMode::kSrc, alpha); + run_test(&srcOverMode, SkBlendMode::kSrcOver, alpha); REPORTER_ASSERT(r, srcMode.getOffset() > srcOverMode.getOffset()); // The two PDFs should not be equal because they have a non-opaque alpha. } -- cgit v1.2.3