From 8073e79e5b8c7dab129112e4494b907b175b7217 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Mon, 13 Nov 2017 18:10:54 -0500 Subject: remove fontmgr_iter_factory GM This explicit use of direct write isn't necessary when the NativeFont bots will do it for us. Change-Id: I39427992d3fa3f602e97c72c5d41dc1b057eb46b Reviewed-on: https://skia-review.googlesource.com/71040 Commit-Queue: Ben Wagner Reviewed-by: Ben Wagner --- gm/fontmgr.cpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'gm/fontmgr.cpp') diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp index b604175b0f..a0b2f5b44a 100644 --- a/gm/fontmgr.cpp +++ b/gm/fontmgr.cpp @@ -12,10 +12,6 @@ #include "SkGraphics.h" #include "SkTypeface.h" -#ifdef SK_BUILD_FOR_WIN - #include "SkTypeface_win.h" -#endif - // limit this just so we don't take too long to draw #define MAX_FAMILIES 30 @@ -55,16 +51,11 @@ static const char* ja = "ja"; class FontMgrGM : public skiagm::GM { public: - FontMgrGM(sk_sp fontMgr = nullptr) { + FontMgrGM() { SkGraphics::SetFontCacheLimit(16 * 1024 * 1024); fName.set("fontmgr_iter"); - if (fontMgr) { - fName.append("_factory"); - fFM = std::move(fontMgr); - } else { - fFM = SkFontMgr::RefDefault(); - } + fFM = SkFontMgr::RefDefault(); fName.append(sk_tool_utils::platform_font_manager()); } @@ -343,7 +334,3 @@ DEF_GM(return new FontMgrMatchGM;) DEF_GM(return new FontMgrBoundsGM(1.0, 0);) DEF_GM(return new FontMgrBoundsGM(0.75, 0);) DEF_GM(return new FontMgrBoundsGM(1.0, -0.25);) - -#ifdef SK_BUILD_FOR_WIN -DEF_GM(return new FontMgrGM(SkFontMgr_New_DirectWrite());) -#endif -- cgit v1.2.3