DM: hide DM:FontMgr behind a factory

Change-Id: I4dc745479ceb1d5ca1ddb4a0904f342576e4562c
Reviewed-on: https://skia-review.googlesource.com/71240
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Hal Canary <halcanary@google.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/dm/DM.cpp b/dm/DM.cpp
index 075a0b2c83..77538cfdc3 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -1320,16 +1320,12 @@ int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
 
     if (!FLAGS_nativeFonts) {
-        gSkFontMgr_DefaultFactory = []() -> sk_sp<SkFontMgr> {
-            return sk_make_sp<DM::FontMgr>();
-        };
+        gSkFontMgr_DefaultFactory = &DM::MakeFontMgr;
     }
 
 #if defined(SK_BUILD_FOR_WIN)
     if (FLAGS_gdi) {
-        gSkFontMgr_DefaultFactory = []() -> sk_sp<SkFontMgr> {
-            return SkFontMgr_New_GDI();
-        };
+        gSkFontMgr_DefaultFactory = &SkFontMgr_New_GDI;
     }
 #endif