diff options
Diffstat (limited to 'gm/shadertext3.cpp')
| -rw-r--r-- | gm/shadertext3.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/gm/shadertext3.cpp b/gm/shadertext3.cpp index b6e2613b48..f28b93a995 100644 --- a/gm/shadertext3.cpp +++ b/gm/shadertext3.cpp @@ -42,8 +42,6 @@ struct LabeledMatrix { const char* fLabel; }; -constexpr char kText[] = "B"; -constexpr int kTextLen = SK_ARRAY_COUNT(kText) - 1; constexpr int kPointSize = 300; class ShaderText3GM : public GM { @@ -72,10 +70,8 @@ protected: bmpPaint.setAlpha(0x80); canvas->drawBitmap(fBmp, 5.f, 5.f, &bmpPaint); + SkFont font(sk_tool_utils::create_portable_typeface(), SkIntToScalar(kPointSize)); SkPaint outlinePaint; - outlinePaint.setAntiAlias(true); - sk_tool_utils::set_portable_typeface(&outlinePaint); - outlinePaint.setTextSize(SkIntToScalar(kPointSize)); outlinePaint.setStyle(SkPaint::kStroke_Style); outlinePaint.setStrokeWidth(0.f); @@ -107,12 +103,10 @@ protected: fillPaint.setShader(SkShader::MakeBitmapShader(fBmp, kTileModes[tm0], kTileModes[tm1], &localM)); - SkFont font(sk_tool_utils::create_portable_typeface(), kPointSize); - - canvas->drawSimpleText(kText, kTextLen, kUTF8_SkTextEncoding, 0, 0, font, fillPaint); - canvas->drawSimpleText(kText, kTextLen, kUTF8_SkTextEncoding, 0, 0, font, - outlinePaint); - SkScalar w = font.measureText(kText, kTextLen, kUTF8_SkTextEncoding); + constexpr char kText[] = "B"; + canvas->drawString(kText, 0, 0, font, fillPaint); + canvas->drawString(kText, 0, 0, font, outlinePaint); + SkScalar w = font.measureText(kText, strlen(kText), kUTF8_SkTextEncoding); canvas->translate(w + 10.f, 0.f); ++i; if (!(i % 2)) { |