| Index: gm/variedtext.cpp
|
| diff --git a/gm/variedtext.cpp b/gm/variedtext.cpp
|
| index 989bebd328d3c0436f700e0a7ed830a531e0ce75..b2b96b34c52686fb581fcddf228c3a70cf49c7c6 100644
|
| --- a/gm/variedtext.cpp
|
| +++ b/gm/variedtext.cpp
|
| @@ -59,10 +59,10 @@ protected:
|
| SkScalar h = SkIntToScalar(size.fHeight);
|
|
|
| SK_COMPILE_ASSERT(4 == SK_ARRAY_COUNT(fTypefacesToUnref), typeface_cnt);
|
| - fTypefacesToUnref[0] = sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kNormal);
|
| - fTypefacesToUnref[1] = sk_tool_utils::create_portable_typeface("sans-serif", SkTypeface::kBold);
|
| - fTypefacesToUnref[2] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kNormal);
|
| - fTypefacesToUnref[3] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kBold);
|
| + fTypefacesToUnref[0] = sk_tool_utils::create_portable_typeface_always("sans-serif", SkTypeface::kNormal);
|
| + fTypefacesToUnref[1] = sk_tool_utils::create_portable_typeface_always("sans-serif", SkTypeface::kBold);
|
| + fTypefacesToUnref[2] = sk_tool_utils::create_portable_typeface_always("serif", SkTypeface::kNormal);
|
| + fTypefacesToUnref[3] = sk_tool_utils::create_portable_typeface_always("serif", SkTypeface::kBold);
|
|
|
| SkRandom random;
|
| for (int i = 0; i < kCnt; ++i) {
|
| @@ -75,6 +75,7 @@ protected:
|
|
|
| fColors[i] = random.nextU();
|
| fColors[i] |= 0xFF000000;
|
| + fColors[i] = sk_tool_utils::color_to_565(fColors[i]);
|
|
|
| static const SkScalar kMinPtSize = 8.f;
|
| static const SkScalar kMaxPtSize = 32.f;
|
|
|