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/SampleXfermodesBlur.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/SampleXfermodesBlur.cpp')
| -rw-r--r-- | samplecode/SampleXfermodesBlur.cpp | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/samplecode/SampleXfermodesBlur.cpp b/samplecode/SampleXfermodesBlur.cpp index 2169ffde53..2a17e6b1b8 100644 --- a/samplecode/SampleXfermodesBlur.cpp +++ b/samplecode/SampleXfermodesBlur.cpp @@ -107,24 +107,20 @@ protected: return; } - 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" }, + 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, }; const SkScalar w = SkIntToScalar(W); @@ -155,7 +151,7 @@ protected: canvas->drawRect(r, p); canvas->saveLayer(&r, nullptr); - draw_mode(canvas, gModes[i].fMode, twice ? 0x88 : 0xFF, r.fLeft, r.fTop); + draw_mode(canvas, gModes[i], twice ? 0x88 : 0xFF, r.fLeft, r.fTop); canvas->restore(); r.inset(-SK_ScalarHalf, -SK_ScalarHalf); @@ -163,7 +159,8 @@ protected: p.setShader(nullptr); canvas->drawRect(r, p); - canvas->drawText(gModes[i].fLabel, strlen(gModes[i].fLabel), + const char* label = SkBlendMode_Name(gModes[i]); + canvas->drawText(label, strlen(label), x + w/2, y - labelP.getTextSize()/2, labelP); x += w + SkIntToScalar(10); if ((i % W) == W - 1) { |