diff options
| author |  Mike Reed <reed@google.com> | 2016-10-05 14:03:43 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-05 18:31:17 +0000 |
| commit | 2b2fc7db4f8a4a4d4a51d7eb4df6aa62e309928d (patch) | |
| tree | cfa3f2de434cb5dcabf98720460105964f78bfc3 /gm/imagefilters.cpp | |
| parent | dbb84c268bd09d2aa47256b5315a87f891583b6b (diff) | |
Revert[6] "replace SkXfermode obj with SkBlendMode enum in paints"
- perform version check in CreateProc for XfermodeImageFilter and ArithmeticImageFilter
This reverts commit 3ed485f4249e17abb4b11f5018d03175fd1afb44.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2992
Change-Id: Ib4a154cdd5f5d1dcac921ef50d53b79a2d6a1be8
Reviewed-on: https://skia-review.googlesource.com/2992
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 e9f54a312d..27422b5611 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, SkXfermode::Mode mode, sk_sp<SkImageFilter> imf) { +static void do_draw(SkCanvas* canvas, SkBlendMode 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, SkXfermode::Mode mode, sk_sp<SkImageFilter paint.setColor(0x660000FF); paint.setImageFilter(std::move(imf)); - paint.setXfermodeMode(mode); + paint.setBlendMode(mode); canvas->drawOval(r1, paint); } @@ -52,8 +52,8 @@ DEF_SIMPLE_GM(imagefilters_xfermodes, canvas, 480, 480) { kNone_SkFilterQuality, nullptr)); - const SkXfermode::Mode modes[] = { - SkXfermode::kSrcATop_Mode, SkXfermode::kDstIn_Mode + const SkBlendMode modes[] = { + SkBlendMode::kSrcATop, SkBlendMode::kDstIn }; for (size_t i = 0; i < SK_ARRAY_COUNT(modes); ++i) { |