diff options
author | Mike Reed <reed@google.com> | 2016-10-04 10:06:20 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-04 20:09:34 +0000 |
commit | 1834242ec6e3cd62669227d394bc79e1cd66dcfb (patch) | |
tree | c956e75f272619b5901ca0beab31dbf4a50d9974 /gm/srcmode.cpp | |
parent | 6942442ef7cc018ac136dd379ad6a30902a060e5 (diff) |
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>
Diffstat (limited to 'gm/srcmode.cpp')
-rw-r--r-- | gm/srcmode.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/srcmode.cpp b/gm/srcmode.cpp index 0d02cdceb0..d57b77cbd9 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 SkXfermode::Mode modes[] = { - SkXfermode::kSrcOver_Mode, SkXfermode::kSrc_Mode, SkXfermode::kClear_Mode + const SkBlendMode modes[] = { + SkBlendMode::kSrcOver, SkBlendMode::kSrc, SkBlendMode::kClear }; 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.setXfermodeMode(modes[x]); + paint.setBlendMode(modes[x]); canvas->save(); for (size_t y = 0; y < SK_ARRAY_COUNT(procs); ++y) { procs[y](canvas, paint); |