diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-07-10 19:40:15 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-13 15:01:04 +0000 |
| commit | 83c6b96bcd38702ec8bbe98f5f77f91121102ad9 (patch) | |
| tree | 62f6b918894e7d1865c020bb0828b0250c2062c8 /gm | |
| parent | a07bf6788e926c41d52ae4bed592ec8a187ee4ab (diff) | |
Improve SkTestFontMgr.
This moves the portable typefaces into the portable font manager.
Change-Id: Id25e8f0b90f99c82d09cfb3ef136bda8c7728ee9
Reviewed-on: https://skia-review.googlesource.com/140351
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/fontmgr.cpp | 2 | ||||
| -rw-r--r-- | gm/typeface.cpp | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp index c3fff702dd..e544a3e4a4 100644 --- a/gm/fontmgr.cpp +++ b/gm/fontmgr.cpp @@ -180,7 +180,7 @@ protected: paint.setTextSize(17); const char* gNames[] = { - "Helvetica Neue", "Arial" + "Helvetica Neue", "Arial", "sans" }; sk_sp<SkFontStyleSet> fset; diff --git a/gm/typeface.cpp b/gm/typeface.cpp index 028e2a1ca3..fe43e756b8 100644 --- a/gm/typeface.cpp +++ b/gm/typeface.cpp @@ -89,10 +89,7 @@ class TypefaceStylesGM : public skiagm::GM { bool fApplyKerning; public: - TypefaceStylesGM(bool applyKerning) - : fApplyKerning(applyKerning) { - memset(fFaces, 0, sizeof(fFaces)); - } + TypefaceStylesGM(bool applyKerning) : fApplyKerning(applyKerning) {} protected: void onOnceBeforeDraw() override { |