Use Skia's matchFamilyStyleCharacter API for font fallback

content/child/font_warmup_win.cc

 // 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 "content/child/font_warmup_win.h"
 
 #include <dwrite.h>
+#include <dwrite_2.h>
 #include <stdint.h>
 #include <map>
 
 #include "base/debug/alias.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/numerics/safe_math.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/sys_byteorder.h"
 #include "base/trace_event/trace_event.h"
 #include "base/win/iat_patch_function.h"
+#include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "content/public/common/dwrite_font_platform_win.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "skia/ext/fontmgr_default_win.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/public/web/win/WebFontRendering.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/ports/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkTypeface_win.h"
 
@@ skipping 417 matching lines @@
   paint_warmup.setTypeface(typeface);
   wchar_t glyph = L'S';
   paint_warmup.measureText(&glyph, 2);
 }
 
 SkFontMgr* GetPreSandboxWarmupFontMgr() {
   if (!g_warmup_fontmgr) {
     IDWriteFactory* factory;
     CreateDirectWriteFactory(&factory);
 
-    g_warmup_fontmgr =
-        SkFontMgr_New_DirectWrite(factory, GetCustomFontCollection(factory));
+    // DirectWrite font fallback does not work if it is initialized after the
+    // sandbox starts.
+    base::win::ScopedComPtr<IDWriteFactory2> factory2;
+    factory->QueryInterface<IDWriteFactory2>(factory2.Receive());
+    base::win::ScopedComPtr<IDWriteFontFallback> font_fallback;
+    if (factory2.get())
+      factory2->GetSystemFontFallback(font_fallback.Receive());
+
+    g_warmup_fontmgr = SkFontMgr_New_DirectWrite(
+        factory, GetCustomFontCollection(factory), font_fallback.get());
     blink::WebFontRendering::setSkiaFontManager(g_warmup_fontmgr);
   }
   return g_warmup_fontmgr;
 }
 
 GdiFontPatchData* PatchGdiFontEnumeration(const base::FilePath& path) {
   if (ShouldUseDirectWriteFontProxyFieldTrial() && !g_warmup_fontmgr)
     g_warmup_fontmgr = SkFontMgr_New_DirectWrite();
   // If not using the font proxy, we assume |g_warmup_fontmgr| is already
   // initialized before this function is called.
@@ skipping 22 matching lines @@
 
   // We need to warm up *some* font for DirectWrite. Note that we don't use
   // a monospace as would be nice in an attempt to avoid a small startup time
   // regression, see http://crbug.com/463613.
   skia::RefPtr<SkTypeface> hud_typeface = skia::AdoptRef(
       GetPreSandboxWarmupFontMgr()->legacyCreateTypeface("Times New Roman", 0));
   DoPreSandboxWarmupForTypeface(hud_typeface.get());
 }
 
 }  // namespace content