| Index: gm/strokefill.cpp
|
| diff --git a/gm/strokefill.cpp b/gm/strokefill.cpp
|
| index fc1a281f007eba70d091245413027432b704a30c..98e9bbb868b3a5852fa18b0612738bbd00c3c01f 100644
|
| --- a/gm/strokefill.cpp
|
| +++ b/gm/strokefill.cpp
|
| @@ -258,12 +258,12 @@ DEF_SIMPLE_GM_BG_NAME(strokefill, canvas, 640, 480, SK_ColorWHITE,
|
| paint.setAntiAlias(true);
|
| paint.setTextSize(SkIntToScalar(100));
|
| paint.setStrokeWidth(SkIntToScalar(5));
|
| -
|
| +
|
| // use paths instead of text to test the path data on all platforms, since the
|
| // Mac-specific font may change or is not available everywhere
|
| path_bold(canvas, papyrus_hello(), paint);
|
| path_bold(canvas, hiragino_maru_gothic_pro_dash(), paint);
|
| -
|
| +
|
| // use the portable typeface to generically test the fake bold code everywhere
|
| // (as long as the freetype option to do the bolding itself isn't enabled)
|
| sk_tool_utils::set_portable_typeface(&paint, "serif");
|
| @@ -304,7 +304,7 @@ DEF_SIMPLE_GM_BG_NAME(strokefill, canvas, 640, 480, SK_ColorWHITE,
|
| path3.addRect(r, SkPath::kCCW_Direction);
|
| canvas->drawPath(path3, paint);
|
|
|
| - r = SkRect::MakeXYWH(x + SkIntToScalar(70), y + SkIntToScalar(280),
|
| + r = SkRect::MakeXYWH(x + SkIntToScalar(70), y + SkIntToScalar(280),
|
| SkIntToScalar(100), SkIntToScalar(100));
|
| SkPath path4;
|
| path4.setFillType(SkPath::kWinding_FillType);
|
| @@ -313,7 +313,7 @@ DEF_SIMPLE_GM_BG_NAME(strokefill, canvas, 640, 480, SK_ColorWHITE,
|
| path4.addRect(r, SkPath::kCW_Direction);
|
| canvas->drawPath(path4, paint);
|
|
|
| - r = SkRect::MakeXYWH(x + SkIntToScalar(190), y + SkIntToScalar(280),
|
| + r = SkRect::MakeXYWH(x + SkIntToScalar(190), y + SkIntToScalar(280),
|
| SkIntToScalar(100), SkIntToScalar(100));
|
| path4.reset();
|
| SkASSERT(!SkPathPriv::CheapComputeFirstDirection(path4, nullptr));
|
| @@ -322,7 +322,7 @@ DEF_SIMPLE_GM_BG_NAME(strokefill, canvas, 640, 480, SK_ColorWHITE,
|
| path4.moveTo(0, 0); // test for crbug.com/247770
|
| canvas->drawPath(path4, paint);
|
|
|
| - r = SkRect::MakeXYWH(x + SkIntToScalar(310), y + SkIntToScalar(280),
|
| + r = SkRect::MakeXYWH(x + SkIntToScalar(310), y + SkIntToScalar(280),
|
| SkIntToScalar(100), SkIntToScalar(100));
|
| path4.reset();
|
| SkASSERT(!SkPathPriv::CheapComputeFirstDirection(path4, nullptr));
|
|
|