diff options
author | 2016-10-04 21:35:32 +0000 | |
---|---|---|
committer | 2016-10-04 21:35:56 +0000 | |
commit | 3ed485f4249e17abb4b11f5018d03175fd1afb44 (patch) | |
tree | faf5a74449f02b51592e17641e48e2b9d2caf6f2 /tools/viewer | |
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 'tools/viewer')
-rw-r--r-- | tools/viewer/sk_app/mac/RasterWindowContext_mac.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/viewer/sk_app/mac/RasterWindowContext_mac.cpp b/tools/viewer/sk_app/mac/RasterWindowContext_mac.cpp index fd2f2effb1..47f349b2eb 100644 --- a/tools/viewer/sk_app/mac/RasterWindowContext_mac.cpp +++ b/tools/viewer/sk_app/mac/RasterWindowContext_mac.cpp @@ -121,7 +121,7 @@ void RasterWindowContext_mac::onSwapBuffers() { (fDisplayParams.fColorSpace != nullptr || kRGBA_F16_SkColorType == fDisplayParams.fColorType); SkPaint gammaPaint; - gammaPaint.setBlendMode(SkBlendMode::kSrc); + gammaPaint.setXfermodeMode(SkXfermode::kSrc_Mode); if (doGamma) { gammaPaint.setColorFilter(SkGammaColorFilter::Make(1.0f / 2.2f)); } |