From 3ed485f4249e17abb4b11f5018d03175fd1afb44 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 4 Oct 2016 21:35:32 +0000 Subject: 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 > Commit-Queue: Mike Reed > 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 Commit-Queue: Mike Reed --- gm/srcmode.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gm/srcmode.cpp') diff --git a/gm/srcmode.cpp b/gm/srcmode.cpp index d57b77cbd9..0d02cdceb0 100644 --- a/gm/srcmode.cpp +++ b/gm/srcmode.cpp @@ -82,8 +82,8 @@ protected: draw_hair, draw_thick, draw_rect, draw_oval, draw_text }; - const SkBlendMode modes[] = { - SkBlendMode::kSrcOver, SkBlendMode::kSrc, SkBlendMode::kClear + const SkXfermode::Mode modes[] = { + SkXfermode::kSrcOver_Mode, SkXfermode::kSrc_Mode, SkXfermode::kClear_Mode }; const PaintProc paintProcs[] = { @@ -96,7 +96,7 @@ protected: for (size_t i = 0; i < SK_ARRAY_COUNT(paintProcs); ++i) { paintProcs[i](&paint); for (size_t x = 0; x < SK_ARRAY_COUNT(modes); ++x) { - paint.setBlendMode(modes[x]); + paint.setXfermodeMode(modes[x]); canvas->save(); for (size_t y = 0; y < SK_ARRAY_COUNT(procs); ++y) { procs[y](canvas, paint); -- cgit v1.2.3