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 /dm/DM.cpp | |
| 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 'dm/DM.cpp')
| -rw-r--r-- | dm/DM.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -5,7 +5,6 @@ * found in the LICENSE file. */ -#include "DMFontMgr.h" #include "DMJsonWriter.h" #include "DMSrcSink.h" #include "ProcStats.h" @@ -37,6 +36,7 @@ #include "SkPngEncoder.h" #include "SkScan.h" #include "SkSpinlock.h" +#include "SkTestFontMgr.h" #include "SkTHash.h" #include "SkTaskGroup.h" #include "SkTypeface_win.h" @@ -103,8 +103,6 @@ DEFINE_bool(ignoreSigInt, false, "ignore SIGINT signals during test execution"); DEFINE_string(dont_write, "", "File extensions to skip writing to --writePath."); // See skia:6821 -DEFINE_bool(nativeFonts, true, "If true, use native font manager and rendering. " - "If false, fonts will draw as portably as possible."); DEFINE_bool(gdi, false, "On Windows, use GDI instead of DirectWrite for font rendering."); using namespace DM; @@ -1323,7 +1321,7 @@ int main(int argc, char** argv) { SkCommandLineFlags::Parse(argc, argv); if (!FLAGS_nativeFonts) { - gSkFontMgr_DefaultFactory = &DM::MakeFontMgr; + gSkFontMgr_DefaultFactory = &sk_tool_utils::MakePortableFontMgr; } #if defined(SK_BUILD_FOR_WIN) |