| Index: gm/typeface.cpp
|
| diff --git a/gm/typeface.cpp b/gm/typeface.cpp
|
| index d22a276862a076c4b8ee28572ac05e2aea4fe837..8303b373582ec7d1bc9b7a31116ee7fdff742141 100644
|
| --- a/gm/typeface.cpp
|
| +++ b/gm/typeface.cpp
|
| @@ -71,7 +71,7 @@ static void drawKernText(SkCanvas* canvas, const void* text, size_t len,
|
| canvas->drawPosText(glyphs, glyphCount * sizeof(uint16_t), pos, glyphPaint);
|
| }
|
|
|
| -static const struct {
|
| +constexpr struct {
|
| const char* fName;
|
| SkTypeface::Style fStyle;
|
| } gFaceStyles[] = {
|
| @@ -89,7 +89,7 @@ static const struct {
|
| { "monospace", SkTypeface::kBoldItalic },
|
| };
|
|
|
| -static const int gFaceStylesCount = SK_ARRAY_COUNT(gFaceStyles);
|
| +constexpr int gFaceStylesCount = SK_ARRAY_COUNT(gFaceStyles);
|
|
|
| class TypefaceStylesGM : public skiagm::GM {
|
| sk_sp<SkTypeface> fFaces[gFaceStylesCount];
|
|
|