diff options
author | Mike Reed <reed@google.com> | 2016-10-05 14:03:43 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-05 18:31:17 +0000 |
commit | 2b2fc7db4f8a4a4d4a51d7eb4df6aa62e309928d (patch) | |
tree | cfa3f2de434cb5dcabf98720460105964f78bfc3 /tests/PDFOpaqueSrcModeToSrcOverTest.cpp | |
parent | dbb84c268bd09d2aa47256b5315a87f891583b6b (diff) |
Revert[6] "replace SkXfermode obj with SkBlendMode enum in paints"
- perform version check in CreateProc for XfermodeImageFilter and ArithmeticImageFilter
This reverts commit 3ed485f4249e17abb4b11f5018d03175fd1afb44.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2992
Change-Id: Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8
Reviewed-on: https://skia-review.googlesource.com/2992
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/PDFOpaqueSrcModeToSrcOverTest.cpp')
-rw-r--r-- | tests/PDFOpaqueSrcModeToSrcOverTest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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<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 @@ 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. } |