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>

1 files changed, 34 insertions, 36 deletions

diff --git a/gm/drawatlascolor.cpp b/gm/drawatlascolor.cpp
index 990bdcb693..e67ffc3031 100644
--- a/gm/drawatlascolor.cpp
+++ b/gm/drawatlascolor.cpp
@@ -74,39 +74,36 @@ protected:
 
         auto atlas = make_atlas(canvas, kAtlasSize);
 
-        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,   "Mod"       },
-            { SkBlendMode::kScreen,     "Screen"    },
-            { SkBlendMode::kOverlay,    "Overlay"   },
-            { SkBlendMode::kDarken,     "Darken"    },
-            { SkBlendMode::kLighten,    "Lighten"   },
-            { SkBlendMode::kColorDodge, "Dodge"     },
-            { SkBlendMode::kColorBurn,  "Burn"      },
-            { SkBlendMode::kHardLight,  "Hard"      },
-            { SkBlendMode::kSoftLight,  "Soft"      },
-            { SkBlendMode::kDifference, "Diff"      },
-            { SkBlendMode::kExclusion,  "Exclusion" },
-            { SkBlendMode::kMultiply,   "Multiply"  },
-            { SkBlendMode::kHue,        "Hue"       },
-            { SkBlendMode::kSaturation, "Sat"       },
-            { 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,
         };
 
         SkColor gColors[] = {
@@ -139,7 +136,8 @@ protected:
         sk_tool_utils::set_portable_typeface(&textP, nullptr);
 
         for (int i = 0; i < numModes; ++i) {
-            canvas->drawText(gModes[i].fLabel, strlen(gModes[i].fLabel),
+            const char* label = SkBlendMode_Name(gModes[i]);
+            canvas->drawText(label, strlen(label),
                              i*(target.width()+kPad)+kPad, SkIntToScalar(kTextPad),
                              textP);
         }
@@ -150,11 +148,11 @@ protected:
                               SkIntToScalar(kTextPad+kPad));
             // w/o a paint
             canvas->drawAtlas(atlas.get(), xforms, rects, quadColors, numColors,
-                              gModes[i].fMode, nullptr, nullptr);
+                              gModes[i], nullptr, nullptr);
             canvas->translate(0.0f, numColors*(target.height()+kPad));
             // w a paint
             canvas->drawAtlas(atlas.get(), xforms, rects, quadColors, numColors,
-                              gModes[i].fMode, nullptr, &paint);
+                              gModes[i], nullptr, &paint);
             canvas->restore();
         }
     }