diff options
| author |  Brian Osman <brianosman@google.com> | 2017-03-15 12:19:37 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-15 16:52:49 +0000 |
| commit | d1e67e70ae566bd841a2926eb07446ad99c64e59 (patch) | |
| tree | 29559577714c17b54b13e6d4de1ca64a096c802b /gm/xfermodeimagefilter.cpp | |
| parent | eaaebb19a17d213355e7a70e0cfabe4ba61929d4 (diff) | |
Use SkBlendMode_Name rather than one-off tables
BUG=skia:
Change-Id: I653ff55bc1164ddae4b03967f2f54bb5fece5a33
Reviewed-on: https://skia-review.googlesource.com/9722
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'gm/xfermodeimagefilter.cpp')
| -rw-r--r-- | gm/xfermodeimagefilter.cpp | 67 |
1 files changed, 32 insertions, 35 deletions
diff --git a/gm/xfermodeimagefilter.cpp b/gm/xfermodeimagefilter.cpp index 77c350235b..bb2378e957 100644 --- a/gm/xfermodeimagefilter.cpp +++ b/gm/xfermodeimagefilter.cpp @@ -48,46 +48,43 @@ protected: canvas->clear(SK_ColorBLACK); SkPaint paint; - const struct { - SkBlendMode fMode; - const char* fLabel; - } gModes[] = { - { SkBlendMode::kClear, "Clear" }, - { SkBlendMode::kSrc, "Src" }, - { SkBlendMode::kDst, "Dst" }, - { SkBlendMode::kSrcOver, "SrcOver" }, - { SkBlendMode::kDstOver, "DstOver" }, - { SkBlendMode::kSrcIn, "SrcIn" }, - { SkBlendMode::kDstIn, "DstIn" }, - { SkBlendMode::kSrcOut, "SrcOut" }, - { SkBlendMode::kDstOut, "DstOut" }, - { SkBlendMode::kSrcATop, "SrcATop" }, - { SkBlendMode::kDstATop, "DstATop" }, - { SkBlendMode::kXor, "Xor" }, - - { SkBlendMode::kPlus, "Plus" }, - { SkBlendMode::kModulate, "Modulate" }, - { SkBlendMode::kScreen, "Screen" }, - { SkBlendMode::kOverlay, "Overlay" }, - { SkBlendMode::kDarken, "Darken" }, - { SkBlendMode::kLighten, "Lighten" }, - { SkBlendMode::kColorDodge, "ColorDodge" }, - { SkBlendMode::kColorBurn, "ColorBurn" }, - { SkBlendMode::kHardLight, "HardLight" }, - { SkBlendMode::kSoftLight, "SoftLight" }, - { SkBlendMode::kDifference, "Difference" }, - { SkBlendMode::kExclusion, "Exclusion" }, - { SkBlendMode::kMultiply, "Multiply" }, - { SkBlendMode::kHue, "Hue" }, - { SkBlendMode::kSaturation, "Saturation" }, - { SkBlendMode::kColor, "Color" }, - { SkBlendMode::kLuminosity, "Luminosity" }, + const SkBlendMode gModes[] = { + SkBlendMode::kClear, + SkBlendMode::kSrc, + SkBlendMode::kDst, + SkBlendMode::kSrcOver, + SkBlendMode::kDstOver, + SkBlendMode::kSrcIn, + SkBlendMode::kDstIn, + SkBlendMode::kSrcOut, + SkBlendMode::kDstOut, + SkBlendMode::kSrcATop, + SkBlendMode::kDstATop, + SkBlendMode::kXor, + + SkBlendMode::kPlus, + SkBlendMode::kModulate, + SkBlendMode::kScreen, + SkBlendMode::kOverlay, + SkBlendMode::kDarken, + SkBlendMode::kLighten, + SkBlendMode::kColorDodge, + SkBlendMode::kColorBurn, + SkBlendMode::kHardLight, + SkBlendMode::kSoftLight, + SkBlendMode::kDifference, + SkBlendMode::kExclusion, + SkBlendMode::kMultiply, + SkBlendMode::kHue, + SkBlendMode::kSaturation, + SkBlendMode::kColor, + SkBlendMode::kLuminosity, }; int x = 0, y = 0; sk_sp<SkImageFilter> background(SkImageSource::Make(fCheckerboard)); for (size_t i = 0; i < SK_ARRAY_COUNT(gModes); i++) { - paint.setImageFilter(SkXfermodeImageFilter::Make(gModes[i].fMode, background)); + paint.setImageFilter(SkXfermodeImageFilter::Make(gModes[i], background)); DrawClippedBitmap(canvas, fBitmap, paint, x, y); x += fBitmap.width() + MARGIN; if (x + fBitmap.width() > WIDTH) { |