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/gamma.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/gamma.cpp')
-rw-r--r-- | gm/gamma.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gm/gamma.cpp b/gm/gamma.cpp index f6b4a9ceed..80209e53f8 100644 --- a/gm/gamma.cpp +++ b/gm/gamma.cpp @@ -75,11 +75,11 @@ DEF_SIMPLE_GM(gamma, canvas, 850, 200) { advance(); }; - auto nextXferRect = [&](SkColor srcColor, SkXfermode::Mode mode, SkColor dstColor) { + auto nextXferRect = [&](SkColor srcColor, SkBlendMode mode, SkColor dstColor) { p.setColor(dstColor); canvas->drawRect(r, p); p.setColor(srcColor); - p.setXfermodeMode(mode); + p.setBlendMode(mode); canvas->drawRect(r, p); SkString srcText = SkStringPrintf("%08X", srcColor); @@ -207,18 +207,18 @@ DEF_SIMPLE_GM(gamma, canvas, 850, 200) { canvas->saveLayer(nullptr, nullptr); - nextXferRect(0x7fffffff, SkXfermode::kSrcOver_Mode, SK_ColorBLACK); - nextXferRect(0x7f000000, SkXfermode::kSrcOver_Mode, SK_ColorWHITE); + nextXferRect(0x7fffffff, SkBlendMode::kSrcOver, SK_ColorBLACK); + nextXferRect(0x7f000000, SkBlendMode::kSrcOver, SK_ColorWHITE); - nextXferRect(SK_ColorBLACK, SkXfermode::kDstOver_Mode, 0x7fffffff); - nextXferRect(SK_ColorWHITE, SkXfermode::kSrcIn_Mode, 0x7fff00ff); - nextXferRect(0x7fff00ff, SkXfermode::kDstIn_Mode, SK_ColorWHITE); + nextXferRect(SK_ColorBLACK, SkBlendMode::kDstOver, 0x7fffffff); + nextXferRect(SK_ColorWHITE, SkBlendMode::kSrcIn, 0x7fff00ff); + nextXferRect(0x7fff00ff, SkBlendMode::kDstIn, SK_ColorWHITE); // 0x89 = 255 * linear_to_srgb(0.25) - nextXferRect(0xff898989, SkXfermode::kPlus_Mode, 0xff898989); + nextXferRect(0xff898989, SkBlendMode::kPlus, 0xff898989); // 0xDB = 255 * linear_to_srgb(sqrt(0.5)) - nextXferRect(0xffdbdbdb, SkXfermode::kModulate_Mode, 0xffdbdbdb); + nextXferRect(0xffdbdbdb, SkBlendMode::kModulate, 0xffdbdbdb); canvas->restore(); } |