From 83c6b96bcd38702ec8bbe98f5f77f91121102ad9 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Tue, 10 Jul 2018 19:40:15 -0400 Subject: 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 Reviewed-by: Mike Klein --- gm/fontmgr.cpp | 2 +- gm/typeface.cpp | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'gm') 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 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 { -- cgit v1.2.3