commit 374772bd61951f01bf84fe17bf53d8867681c9ae
author reed <reed@google.com> Wed Oct 05 17:33:02 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Oct 05 17:33:03 2016 -0700
tree ade94be090be12f7503fd35e77c4dae2dc1f0a47
parent 61c21cdcc31081a1bd4a3a7480b482d135f7df33

Revert[8] "replace SkXfermode obj with SkBlendMode enum in paints"

This reverts commit c245574ba3d0e2ade6c94b2812de3baa383bf4c4.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2396953002

TBR=

Review-Url: https://codereview.chromium.org/2396953002

tests/PDFOpaqueSrcModeToSrcOverTest.cpp

diff --git a/tests/PDFOpaqueSrcModeToSrcOverTest.cpp b/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
index 76796f5..e15234d 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<SkDocument> 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 @@
     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 @@
     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.
 }