Customize SkFontMgr::Factory to control DirectWrite vs. GDI selection

skia/ext/fontmgr_default_win.cc

Index: skia/ext/fontmgr_default_win.cc
diff --git a/skia/ext/fontmgr_default_win.cc b/skia/ext/fontmgr_default_win.cc
new file mode 100644
index 0000000000000000000000000000000000000000..41ce2b921dec4b622b77715cc4801a68557862a6
--- /dev/null
+++ b/skia/ext/fontmgr_default_win.cc
@@ -0,0 +1,29 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "skia/ext/fontmgr_default_win.h"
+
+#include "content/common/sandbox_win.h"
+#include "content/public/renderer/render_font_warmup_win.h"

[bungeman-skia, 2014/06/18 19:21:35]

Isn't part of the point of this file not to have these two 'content' includes?
They don't appear to be used.

[scottmg, 2014/06/18 19:30:55]

Oops, yes, you're right. Thanks, done.

+#include "third_party/skia/include/ports/SkFontMgr.h"
+#include "third_party/skia/include/ports/SkTypeface_win.h"
+
+namespace {
+
+SkFontMgr* g_default_fontmgr;
+
+}  // namespace
+
+void SetDefaultSkiaFactory(SkFontMgr* fontmgr) {
+  g_default_fontmgr = fontmgr;
+}
+
+SK_API SkFontMgr* SkFontMgr::Factory() {
+  // This will be set when DirectWrite is in use, and an SkFontMgr has been
+  // created with the pre-sandbox warmed up one. Otherwise, we fallback to a
+  // GDI SkFontMgr which is used in the browser.
+  if (g_default_fontmgr)
+    return g_default_fontmgr;
+  return SkFontMgr_New_GDI();
+}