diff options
author | Mike Reed <reed@google.com> | 2016-10-05 19:59:51 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-05 20:20:14 +0000 |
commit | c245574ba3d0e2ade6c94b2812de3baa383bf4c4 (patch) | |
tree | e008f8500d56d8487a2941cb217c5ff8d1151dcf /gm/gamma.cpp | |
parent | 62f6856ebe003743192508653914b5e01ffcc857 (diff) |
Revert[7] "replace SkXfermode obj with SkBlendMode enum in paints"
This reverts commit Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8.
Reason for revert: new assert from 100K bot
Original change's description:
> Revert[6] "replace SkXfermode obj with SkBlendMode enum in paints"
>
> - perform version check in CreateProc for XfermodeImageFilter and ArithmeticImageFilter
> This reverts commit 3ed485f4249e17abb4b11f5018d03175fd1afb44.
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2992
>
> Change-Id: Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8
> Reviewed-on: https://skia-review.googlesource.com/2992
> 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: I848e5a69c5cd67f2c14889f4f0a346652578c4ff
Reviewed-on: https://skia-review.googlesource.com/3023
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: 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 80209e53f8..f6b4a9ceed 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, SkBlendMode mode, SkColor dstColor) { + auto nextXferRect = [&](SkColor srcColor, SkXfermode::Mode mode, SkColor dstColor) { p.setColor(dstColor); canvas->drawRect(r, p); p.setColor(srcColor); - p.setBlendMode(mode); + p.setXfermodeMode(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, SkBlendMode::kSrcOver, SK_ColorBLACK); - nextXferRect(0x7f000000, SkBlendMode::kSrcOver, SK_ColorWHITE); + nextXferRect(0x7fffffff, SkXfermode::kSrcOver_Mode, SK_ColorBLACK); + nextXferRect(0x7f000000, SkXfermode::kSrcOver_Mode, SK_ColorWHITE); - nextXferRect(SK_ColorBLACK, SkBlendMode::kDstOver, 0x7fffffff); - nextXferRect(SK_ColorWHITE, SkBlendMode::kSrcIn, 0x7fff00ff); - nextXferRect(0x7fff00ff, SkBlendMode::kDstIn, SK_ColorWHITE); + nextXferRect(SK_ColorBLACK, SkXfermode::kDstOver_Mode, 0x7fffffff); + nextXferRect(SK_ColorWHITE, SkXfermode::kSrcIn_Mode, 0x7fff00ff); + nextXferRect(0x7fff00ff, SkXfermode::kDstIn_Mode, SK_ColorWHITE); // 0x89 = 255 * linear_to_srgb(0.25) - nextXferRect(0xff898989, SkBlendMode::kPlus, 0xff898989); + nextXferRect(0xff898989, SkXfermode::kPlus_Mode, 0xff898989); // 0xDB = 255 * linear_to_srgb(sqrt(0.5)) - nextXferRect(0xffdbdbdb, SkBlendMode::kModulate, 0xffdbdbdb); + nextXferRect(0xffdbdbdb, SkXfermode::kModulate_Mode, 0xffdbdbdb); canvas->restore(); } |