AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove fontmgr_iter_factory GM

Browse Source 
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 <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
This commit is contained in:
Mike Klein 2017-11-13 18:10:54 -05:00 committed by Skia Commit-Bot
parent 1662257bda
commit 8073e79e5b
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gm/fontmgr.cpp
View File

@ -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<SkFontMgr> 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