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 /gm/lcdoverlap.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 'gm/lcdoverlap.cpp')
| -rw-r--r-- | gm/lcdoverlap.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/gm/lcdoverlap.cpp b/gm/lcdoverlap.cpp index 380878539f..623d74622d 100644 --- a/gm/lcdoverlap.cpp +++ b/gm/lcdoverlap.cpp @@ -49,8 +49,8 @@ protected: SkISize onISize() override { return SkISize::Make(kWidth, kHeight); } - void drawTestCase(SkCanvas* canvas, SkScalar x, SkScalar y, SkBlendMode mode, - SkBlendMode mode2) { + void drawTestCase(SkCanvas* canvas, SkScalar x, SkScalar y, SkXfermode::Mode mode, + SkXfermode::Mode mode2) { const SkColor colors[] { SK_ColorRED, SK_ColorGREEN, @@ -60,6 +60,8 @@ protected: SK_ColorMAGENTA, }; + sk_sp<SkXfermode> xfermode(SkXfermode::Make(mode)); + sk_sp<SkXfermode> xfermode2(SkXfermode::Make(mode2)); for (size_t i = 0; i < SK_ARRAY_COUNT(colors); i++) { canvas->save(); canvas->translate(x, y); @@ -68,7 +70,7 @@ protected: SkPaint textPaint; textPaint.setColor(colors[i]); - textPaint.setBlendMode(i % 2 == 0 ? mode : mode2); + textPaint.setXfermode(i % 2 == 0 ? xfermode : xfermode2); canvas->drawTextBlob(fBlob, 0, 0, textPaint); canvas->restore(); } @@ -77,11 +79,13 @@ protected: void onDraw(SkCanvas* canvas) override { SkScalar offsetX = kWidth / 4.0f; SkScalar offsetY = kHeight / 4.0f; - drawTestCase(canvas, offsetX, offsetY, SkBlendMode::kSrc, SkBlendMode::kSrc); - drawTestCase(canvas, 3 * offsetX, offsetY, SkBlendMode::kSrcOver, SkBlendMode::kSrcOver); - drawTestCase(canvas, offsetX, 3 * offsetY, SkBlendMode::kHardLight, - SkBlendMode::kLuminosity); - drawTestCase(canvas, 3 * offsetX, 3 * offsetY, SkBlendMode::kSrcOver, SkBlendMode::kSrc); + drawTestCase(canvas, offsetX, offsetY, SkXfermode::kSrc_Mode, SkXfermode::kSrc_Mode); + drawTestCase(canvas, 3 * offsetX, offsetY, SkXfermode::kSrcOver_Mode, + SkXfermode::kSrcOver_Mode); + drawTestCase(canvas, offsetX, 3 * offsetY, SkXfermode::kHardLight_Mode, + SkXfermode::kLuminosity_Mode); + drawTestCase(canvas, 3 * offsetX, 3 * offsetY, SkXfermode::kSrcOver_Mode, + SkXfermode::kSrc_Mode); } private: |