From 1834242ec6e3cd62669227d394bc79e1cd66dcfb Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 4 Oct 2016 10:06:20 -0400 Subject: 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 Commit-Queue: Mike Reed --- gm/lcdoverlap.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'gm/lcdoverlap.cpp') diff --git a/gm/lcdoverlap.cpp b/gm/lcdoverlap.cpp index 623d74622d..380878539f 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, SkXfermode::Mode mode, - SkXfermode::Mode mode2) { + void drawTestCase(SkCanvas* canvas, SkScalar x, SkScalar y, SkBlendMode mode, + SkBlendMode mode2) { const SkColor colors[] { SK_ColorRED, SK_ColorGREEN, @@ -60,8 +60,6 @@ protected: SK_ColorMAGENTA, }; - sk_sp xfermode(SkXfermode::Make(mode)); - sk_sp xfermode2(SkXfermode::Make(mode2)); for (size_t i = 0; i < SK_ARRAY_COUNT(colors); i++) { canvas->save(); canvas->translate(x, y); @@ -70,7 +68,7 @@ protected: SkPaint textPaint; textPaint.setColor(colors[i]); - textPaint.setXfermode(i % 2 == 0 ? xfermode : xfermode2); + textPaint.setBlendMode(i % 2 == 0 ? mode : mode2); canvas->drawTextBlob(fBlob, 0, 0, textPaint); canvas->restore(); } @@ -79,13 +77,11 @@ protected: void onDraw(SkCanvas* canvas) override { SkScalar offsetX = kWidth / 4.0f; SkScalar offsetY = kHeight / 4.0f; - 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); + 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); } private: -- cgit v1.2.3