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 /samplecode/SampleXfer.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 'samplecode/SampleXfer.cpp')
-rw-r--r-- | samplecode/SampleXfer.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/samplecode/SampleXfer.cpp b/samplecode/SampleXfer.cpp index 738541fa37..9ca2e78c0c 100644 --- a/samplecode/SampleXfer.cpp +++ b/samplecode/SampleXfer.cpp @@ -17,19 +17,16 @@ #include "SkSurface.h" #include "SkGradientShader.h" -const struct { - SkBlendMode fMode; - const char* fName; -} gModes[] = { - { SkBlendMode::kSrcOver, "src-over" }, - { SkBlendMode::kSrc, "src" }, - { SkBlendMode::kSrcIn, "src-in" }, - { SkBlendMode::kSrcOut, "src-out" }, - { SkBlendMode::kSrcATop, "src-atop" }, - { SkBlendMode::kDstOver, "dst-over" }, - { SkBlendMode::kDstIn, "dst-in" }, - { SkBlendMode::kDstOut, "dst-out" }, - { SkBlendMode::kDstATop, "dst-atop" }, +const SkBlendMode gModes[] = { + SkBlendMode::kSrcOver, + SkBlendMode::kSrc, + SkBlendMode::kSrcIn, + SkBlendMode::kSrcOut, + SkBlendMode::kSrcATop, + SkBlendMode::kDstOver, + SkBlendMode::kDstIn, + SkBlendMode::kDstOut, + SkBlendMode::kDstATop, }; const int N_Modes = SK_ARRAY_COUNT(gModes); @@ -160,7 +157,7 @@ class XferDemo : public SampleView { SkScalar x = 10; SkScalar y = 10; for (int i = 0; i < N_Modes; ++i) { - sk_sp<SkView> v(new PushButtonWig(gModes[i].fName, (int)gModes[i].fMode)); + sk_sp<SkView> v(new PushButtonWig(SkBlendMode_Name(gModes[i]), (int)gModes[i])); v->setSize(70, 25); v->setLoc(x, y); v->setVisibleP(true); @@ -209,7 +206,7 @@ protected: SkPaint paint; if (fSelected) { for (int i = 0; i < N_Modes; ++i) { - if (fSelected->fMode == gModes[i].fMode) { + if (fSelected->fMode == gModes[i]) { canvas->drawRect(fModeRect[i], paint); break; } |