diff options
| author |  Mike Reed <reed@google.com> | 2016-10-04 21:35:32 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-04 21:35:56 +0000 |
| commit | 3ed485f4249e17abb4b11f5018d03175fd1afb44 (patch) | |
| tree | faf5a74449f02b51592e17641e48e2b9d2caf6f2 /tests/PDFOpaqueSrcModeToSrcOverTest.cpp | |
| parent | 8174ebe30330f857bbf0ba700e1f03b8beb4ee71 (diff) | |
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 <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
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 <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 e15234d090..76796f5500 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, SkBlendMode mode, U8CPU alpha) { +static void run_test(SkWStream* out, SkXfermode::Mode 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.setBlendMode(mode); + background.setXfermodeMode(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, SkBlendMode::kSrc, alpha); - run_test(&srcOverMode, SkBlendMode::kSrcOver, alpha); + run_test(&srcMode, SkXfermode::kSrc_Mode, alpha); + run_test(&srcOverMode, SkXfermode::kSrcOver_Mode, 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, SkBlendMode::kSrc, alpha); - run_test(&srcOverMode, SkBlendMode::kSrcOver, alpha); + run_test(&srcMode, SkXfermode::kSrc_Mode, alpha); + run_test(&srcOverMode, SkXfermode::kSrcOver_Mode, alpha); REPORTER_ASSERT(r, srcMode.getOffset() > srcOverMode.getOffset()); // The two PDFs should not be equal because they have a non-opaque alpha. } |