diff options
| author |  Mike Reed <reed@google.com> | 2016-10-04 21:35:32 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-04 21:35:56 +0000 |
| commit | 3ed485f4249e17abb4b11f5018d03175fd1afb44 (patch) | |
| tree | faf5a74449f02b51592e17641e48e2b9d2caf6f2 /gm/dstreadshuffle.cpp | |
| parent | 8174ebe30330f857bbf0ba700e1f03b8beb4ee71 (diff) | |
Revert[5] "replace SkXfermode obj with SkBlendMode enum in paints"
This reverts commit I0fa5c58af428f3da8565465d1219a34ef8417d9a.
Reason for revert: failing to deserialize some of the 100K
Original change's description:
> 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>
>
TBR=reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I1805a57eef5ebcac203da5989c8539345ecf806f
Reviewed-on: https://skia-review.googlesource.com/2962
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'gm/dstreadshuffle.cpp')
| -rw-r--r-- | gm/dstreadshuffle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gm/dstreadshuffle.cpp b/gm/dstreadshuffle.cpp index 72a68b1d9d..47c70563b5 100644 --- a/gm/dstreadshuffle.cpp +++ b/gm/dstreadshuffle.cpp @@ -159,8 +159,8 @@ protected: p.setColor(color); // In order to get some batching on the GPU backend we do 2 src over for // each xfer mode which requires a dst read - p.setBlendMode(r % 3 == 0 ? SkBlendMode::kLighten : - SkBlendMode::kSrcOver); + p.setXfermodeMode(r % 3 == 0 ? SkXfermode::kLighten_Mode : + SkXfermode::kSrcOver_Mode); SetStyle(&p, style, width); canvas->save(); canvas->translate(x, y); |