commit 19cc0f647c886a2aa658d6e370ba32caa3ece5f1
author Mike Klein <mtklein@google.com> Fri Mar 22 15:30:07 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 22 21:06:29 2019 +0000
tree 2d3afd35b589e0d8ecd8462f19b2561153bf32d2
parent 629f5fc5ec984662f70141a41cda0f1ff6db552f

create a wrapper to manage --nativeFonts and --gdi

Put it in ToolUtils to avoid cyclic dependencies.

Change-Id: Ie0ad7eb5d1ba58be5ad8c668afdb7c74facd71dc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/203181
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

tools/viewer/Viewer.cpp

diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index fe9fef6..6cad26e 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -20,7 +20,6 @@
 #include "SampleSlide.h"
 #include "SkCanvas.h"
 #include "SkColorSpacePriv.h"
-#include "SkFontMgrPriv.h"
 #include "SkGraphics.h"
 #include "SkImagePriv.h"
 #include "SkJSONWriter.h"
@@ -36,7 +35,7 @@
 #include "SkTo.h"
 #include "SlideDir.h"
 #include "SvgSlide.h"
-#include "TestFontMgr.h"
+#include "ToolUtils.h"
 #include "ccpr/GrCoverageCountingPathRenderer.h"
 
 #include <stdlib.h>
@@ -245,9 +244,7 @@
     SetResourcePath("/data/local/tmp/resources");
 #endif
 
-    if (!FLAGS_nativeFonts) {
-        gSkFontMgr_DefaultFactory = &ToolUtils::MakePortableFontMgr;
-    }
+    ToolUtils::SetDefaultFontMgr();
 
     initializeEventTracingForTools();
     static SkTaskGroup::Enabler kTaskGroupEnabler(FLAGS_threads);