diff options
| author |  Mike Reed <reed@google.com> | 2016-10-03 18:02:50 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-03 18:03:29 +0000 |
| commit | ce02e7175872abde3721df9e5d3ec0ab8384cd8e (patch) | |
| tree | 620eec63e1082137df3111d09cd2bf1eb7ebd180 /src/xps | |
| parent | 6fb592e6afb0061c9c0af15ddf599e2903f508f1 (diff) | |
Revert "replace SkXfermode obj with SkBlendMode enum in paints"
This reverts commit I4fb489ba6b3f77b458f7e4a99f79c7ad10859135.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> replace SkXfermode obj with SkBlendMode enum in paints
>
> BUG=skia:5814
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2714
>
> Change-Id: I4fb489ba6b3f77b458f7e4a99f79c7ad10859135
> Reviewed-on: https://skia-review.googlesource.com/2714
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
>
TBR=bsalomon@google.com,fmalita@chromium.org,fmalita@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I3e43f79ef5c1709929663fe63cc1f67cd78270b7
Reviewed-on: https://skia-review.googlesource.com/2871
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/xps')
| -rw-r--r-- | src/xps/SkXPSDevice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp index 5db644c30a..7757cb8774 100644 --- a/src/xps/SkXPSDevice.cpp +++ b/src/xps/SkXPSDevice.cpp @@ -1220,7 +1220,7 @@ void SkXPSDevice::internalDrawRect(const SkDraw& d, const SkPaint& paint) { //Exit early if there is nothing to draw. if (d.fRC->isEmpty() || - (paint.getAlpha() == 0 && paint.isSrcOver())) { + (paint.getAlpha() == 0 && paint.getXfermode() == nullptr)) { return; } @@ -1536,7 +1536,7 @@ void SkXPSDevice::drawPath(const SkDraw& d, // nothing to draw if (d.fRC->isEmpty() || - (paint->getAlpha() == 0 && paint->isSrcOver())) { + (paint->getAlpha() == 0 && paint->getXfermode() == nullptr)) { return; } |