diff options
| author |  Mike Reed <reed@google.com> | 2016-10-03 21:34:16 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-03 21:34:36 +0000 |
| commit | 2cbcd12281ee807214df094964c584c78932e10b (patch) | |
| tree | 456f2c92158b18a8b010cc6e5bb594b73fbb998e /gm/gamma.cpp | |
| parent | 418374c0d27280f3a1161601ae5fab28a76a0d3c (diff) | |
Revert "Revert "Revert "replace SkXfermode obj with SkBlendMode enum in paints"""
This reverts commit I86875511a13497112827cbaed1dbd7639e9e3d10.
legacy (100K) skp failure
Original change's description:
> Revert "Revert "replace SkXfermode obj with SkBlendMode enum in paints""
>
> This reverts commit ce02e7175872abde3721df9e5d3ec0ab8384cd8e.
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2878
>
> Change-Id: I86875511a13497112827cbaed1dbd7639e9e3d10
> Reviewed-on: https://skia-review.googlesource.com/2878
> Reviewed-by: Matt Sarett <msarett@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=msarett@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ife6f0cf3a22b3e8cf885a188f7f44e1ff62e06a5
Reviewed-on: https://skia-review.googlesource.com/2881
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 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(); } |