diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-02-20 17:06:07 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-21 03:31:14 +0000 |
| commit | 483c772cfdd646fad3ae8aa187136191ae3babdc (patch) | |
| tree | 6bfe0818629abcf41fab36a48daeb0327e2ec6a4 /tools/skqp | |
| parent | 14b7375aa648ef88135396ec14296aa676f40004 (diff) | |
Add nativeFonts flag to Viewer.
This moves DMFontMgr and several related files which are tightly related
to fonts into tools/fonts, moves some flags around to prevent
duplication, and adds the nativeFonts handling to Viewer.
Change-Id: Id1bdad708a6b74319ac5ac9adfe21025db4ca0b2
Reviewed-on: https://skia-review.googlesource.com/108904
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'tools/skqp')
| -rw-r--r-- | tools/skqp/gm_runner.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/skqp/gm_runner.cpp b/tools/skqp/gm_runner.cpp index 942c577cf3..778c2bc665 100644 --- a/tools/skqp/gm_runner.cpp +++ b/tools/skqp/gm_runner.cpp @@ -9,7 +9,7 @@ #include <algorithm> -#include "../dm/DMFontMgr.h" +#include "../tools/fonts/SkTestFontMgr.h" #include "GrContext.h" #include "GrContextOptions.h" #include "SkFontMgrPriv.h" @@ -243,7 +243,7 @@ std::tuple<float, Error> EvaluateGM(SkiaBackend backend, void InitSkia(Mode mode, skqp::AssetManager* mgr) { SkGraphics::Init(); - gSkFontMgr_DefaultFactory = &DM::MakeFontMgr; + gSkFontMgr_DefaultFactory = &sk_tool_utils::MakePortableFontMgr; gMode = mode; readlist(mgr, "skqp/DoNotScoreInCompatibilityTestMode.txt", |