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/xfermodes3.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/xfermodes3.cpp')
| -rw-r--r-- | gm/xfermodes3.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/xfermodes3.cpp b/gm/xfermodes3.cpp index 36702bf70e..300b78f2a2 100644 --- a/gm/xfermodes3.cpp +++ b/gm/xfermodes3.cpp @@ -69,7 +69,7 @@ protected: }; for (size_t s = 0; s < SK_ARRAY_COUNT(kStrokes); ++s) { for (size_t m = 0; m <= SkXfermode::kLastMode; ++m) { - SkBlendMode mode = static_cast<SkBlendMode>(m); + SkXfermode::Mode mode = static_cast<SkXfermode::Mode>(m); canvas->drawText(SkXfermode::ModeName(mode), strlen(SkXfermode::ModeName(mode)), SkIntToScalar(x), @@ -77,7 +77,7 @@ protected: labelP); for (size_t c = 0; c < SK_ARRAY_COUNT(kSolidColors); ++c) { SkPaint modePaint; - modePaint.setBlendMode(mode); + modePaint.setXfermodeMode(mode); modePaint.setColor(kSolidColors[c]); modePaint.setStyle(kStrokes[s].fStyle); modePaint.setStrokeWidth(kStrokes[s].fWidth); @@ -93,7 +93,7 @@ protected: } for (size_t a = 0; a < SK_ARRAY_COUNT(kBmpAlphas); ++a) { SkPaint modePaint; - modePaint.setBlendMode(mode); + modePaint.setXfermodeMode(mode); modePaint.setAlpha(kBmpAlphas[a]); modePaint.setShader(fBmpShader); modePaint.setStyle(kStrokes[s].fStyle); |