diff options
| author |  Mike Reed <reed@google.com> | 2016-10-28 15:42:34 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-28 20:06:17 +0000 |
| commit | 7d954ad797176afedb9262fdea4507d0fc60eb9d (patch) | |
| tree | 27c6dc324f83877371d91a58beb21e4b00176a94 /gm/patch.cpp | |
| parent | 99e3f7d6fcb7b3b4340286455733a7de9eb4ef81 (diff) | |
remove xfermode from public api
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4020
CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
Change-Id: I19cd056f2af778f10e8c6c2b7b2735593b43dbac
Reviewed-on: https://skia-review.googlesource.com/4020
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'gm/patch.cpp')
| -rw-r--r-- | gm/patch.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gm/patch.cpp b/gm/patch.cpp index 6b2d298468..c9831c40e7 100644 --- a/gm/patch.cpp +++ b/gm/patch.cpp @@ -85,36 +85,34 @@ DEF_SIMPLE_GM(patch_primitive, canvas, 1500, 1100) { {0.0f, 0.0f}, {100.0f, 0.0f}, {100.0f,100.0f}, {0.0f, 100.0f}} ; - const SkXfermode::Mode modes[] = { - SkXfermode::kSrc_Mode, - SkXfermode::kDst_Mode, - SkXfermode::kModulate_Mode, + const SkBlendMode modes[] = { + SkBlendMode::kSrc, + SkBlendMode::kDst, + SkBlendMode::kModulate, }; sk_sp<SkShader> shader(make_shader()); canvas->save(); for (int y = 0; y < 3; y++) { - sk_sp<SkXfermode> xfer(SkXfermode::Make(modes[y])); - for (int x = 0; x < 4; x++) { canvas->save(); canvas->translate(x * 350.0f, y * 350.0f); switch (x) { case 0: - canvas->drawPatch(cubics, nullptr, nullptr, xfer, paint); + canvas->drawPatch(cubics, nullptr, nullptr, modes[y], paint); break; case 1: - canvas->drawPatch(cubics, colors, nullptr, xfer, paint); + canvas->drawPatch(cubics, colors, nullptr, modes[y], paint); break; case 2: paint.setShader(shader); - canvas->drawPatch(cubics, nullptr, texCoords, xfer, paint); + canvas->drawPatch(cubics, nullptr, texCoords, modes[y], paint); paint.setShader(nullptr); break; case 3: paint.setShader(shader); - canvas->drawPatch(cubics, colors, texCoords, xfer, paint); + canvas->drawPatch(cubics, colors, texCoords, modes[y], paint); paint.setShader(nullptr); break; default: |