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/tablecolorfilter.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/tablecolorfilter.cpp')
| -rw-r--r-- | gm/tablecolorfilter.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/gm/tablecolorfilter.cpp b/gm/tablecolorfilter.cpp index 26a3c2c4f1..0f870c67c1 100644 --- a/gm/tablecolorfilter.cpp +++ b/gm/tablecolorfilter.cpp @@ -198,12 +198,12 @@ class ComposeColorFilterGM : public skiagm::GM { COLOR_COUNT = 3, MODE_COUNT = 4, }; - const SkColor* fColors; - const SkXfermode::Mode* fModes; - SkString fName; + const SkColor* fColors; + const SkBlendMode* fModes; + SkString fName; public: - ComposeColorFilterGM(const SkColor colors[], const SkXfermode::Mode modes[], + ComposeColorFilterGM(const SkColor colors[], const SkBlendMode modes[], const char suffix[]) : fColors(colors), fModes(modes) { @@ -276,19 +276,19 @@ private: }; const SkColor gColors0[] = { SK_ColorCYAN, SK_ColorMAGENTA, SK_ColorYELLOW }; -const SkXfermode::Mode gModes0[] = { - SkXfermode::kOverlay_Mode, - SkXfermode::kDarken_Mode, - SkXfermode::kColorBurn_Mode, - SkXfermode::kExclusion_Mode, +const SkBlendMode gModes0[] = { + SkBlendMode::kOverlay, + SkBlendMode::kDarken, + SkBlendMode::kColorBurn, + SkBlendMode::kExclusion, }; DEF_GM( return new ComposeColorFilterGM(gColors0, gModes0, "wacky"); ) const SkColor gColors1[] = { 0x80FF0000, 0x8000FF00, 0x800000FF }; -const SkXfermode::Mode gModes1[] = { - SkXfermode::kSrcOver_Mode, - SkXfermode::kXor_Mode, - SkXfermode::kDstOut_Mode, - SkXfermode::kSrcATop_Mode, +const SkBlendMode gModes1[] = { + SkBlendMode::kSrcOver, + SkBlendMode::kXor, + SkBlendMode::kDstOut, + SkBlendMode::kSrcATop, }; DEF_GM( return new ComposeColorFilterGM(gColors1, gModes1, "alpha"); ) |