diff options
| author |  bungeman <bungeman@google.com> | 2016-07-12 06:55:25 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-12 06:55:25 -0700 |
| commit | 5dba301e916448bbb17bfe8e70dc367f32eb7159 (patch) | |
| tree | 331ca95144687eb17efe8af99835af218d31938a | |
| parent | aeadcdfbf203ccfedece9721d410192491815fc1 (diff) | |
Use hintgasp font when testing rendering.
The hintgasp font was added specifically for the typefacerendering gm.
However, this gm didn't actually use the font, so now use it. In
addition this adds embedded bitmap strikes to the hintgasp font and the
gm is updated to test these as well.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2140863002
NOTREECHECKS=true
Test only change, does not affect users.
Review-Url: https://codereview.chromium.org/2140863002
| -rw-r--r-- | gm/typeface.cpp | 8 | ||||
| -rw-r--r-- | resources/fonts/hintgasp.ttf | bin | 15396 -> 16164 bytes |
2 files changed, 6 insertions, 2 deletions
diff --git a/gm/typeface.cpp b/gm/typeface.cpp index 8b6a64866b..34420dbee1 100644 --- a/gm/typeface.cpp +++ b/gm/typeface.cpp @@ -180,7 +180,7 @@ protected: } SkISize onISize() override { - return SkISize::Make(640, 480); + return SkISize::Make(640, 680); } void onDraw(SkCanvas* canvas) override { @@ -204,7 +204,8 @@ protected: // GASP_DOGRAY|GASP_GRIDFIT 0x0003 13<=ppem<=14 // GASP_SYMMETRIC_SMOOTHING|GASP_SYMMETRIC_GRIDFIT 0x000C 13<=ppem<=14 // (neither) 0x0000 15<=ppem - constexpr SkScalar textSizes[] = { 10, 12, 14, 16 }; + // Odd sizes have embedded bitmaps. + constexpr SkScalar textSizes[] = { 9, 10, 11, 12, 13, 14, 15, 16 }; constexpr SkPaint::Hinting hintingTypes[] = { SkPaint::kNo_Hinting, SkPaint::kSlight_Hinting, @@ -224,6 +225,9 @@ protected: constexpr bool rotateABitTypes[] = { false, true }; SkPaint paint; + paint.setTypeface(fFace); + paint.setEmbeddedBitmapText(true); + SkScalar x = 0; SkScalar xMax = x; SkScalar xBase = 0; diff --git a/resources/fonts/hintgasp.ttf b/resources/fonts/hintgasp.ttf Binary files differindex f533643cb1..ce1771ebf8 100644 --- a/resources/fonts/hintgasp.ttf +++ b/resources/fonts/hintgasp.ttf |