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 /gm/imagefilters.cpp | |
| 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 'gm/imagefilters.cpp')
| -rw-r--r-- | gm/imagefilters.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/imagefilters.cpp b/gm/imagefilters.cpp index 27422b5611..e9f54a312d 100644 --- a/gm/imagefilters.cpp +++ b/gm/imagefilters.cpp @@ -19,7 +19,7 @@ * * see https://bug.skia.org/3741 */ -static void do_draw(SkCanvas* canvas, SkBlendMode mode, sk_sp<SkImageFilter> imf) { +static void do_draw(SkCanvas* canvas, SkXfermode::Mode mode, sk_sp<SkImageFilter> imf) { SkAutoCanvasRestore acr(canvas, true); canvas->clipRect(SkRect::MakeWH(220, 220)); @@ -40,7 +40,7 @@ static void do_draw(SkCanvas* canvas, SkBlendMode mode, sk_sp<SkImageFilter> imf paint.setColor(0x660000FF); paint.setImageFilter(std::move(imf)); - paint.setBlendMode(mode); + paint.setXfermodeMode(mode); canvas->drawOval(r1, paint); } @@ -52,8 +52,8 @@ DEF_SIMPLE_GM(imagefilters_xfermodes, canvas, 480, 480) { kNone_SkFilterQuality, nullptr)); - const SkBlendMode modes[] = { - SkBlendMode::kSrcATop, SkBlendMode::kDstIn + const SkXfermode::Mode modes[] = { + SkXfermode::kSrcATop_Mode, SkXfermode::kDstIn_Mode }; for (size_t i = 0; i < SK_ARRAY_COUNT(modes); ++i) { |