Chromium Code Reviews| Index: content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc |
| diff --git a/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc b/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc |
| index 58d10551b9b268b36072ae0faa2c553fe285acc5..5f44ccd05615c6e4a1ffdef26a33578444d2747e 100644 |
| --- a/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc |
| +++ b/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc |
| @@ -12,6 +12,7 @@ |
| #include "base/win/iat_patch_function.h" |
| #include "base/win/windows_version.h" |
| #include "content/child/dwrite_font_proxy/dwrite_font_proxy_win.h" |
| +#include "content/child/dwrite_font_proxy/font_fallback_win.h" |
| #include "content/child/font_warmup_win.h" |
| #include "skia/ext/fontmgr_default_win.h" |
| #include "third_party/WebKit/public/web/win/WebFontRendering.h" |
| @@ -71,8 +72,12 @@ void InitializeDWriteFontProxy() { |
| &g_font_collection, factory.Get(), g_sender_override); |
| } |
| - sk_sp<SkFontMgr> skia_font_manager( |
| - SkFontMgr_New_DirectWrite(factory.Get(), g_font_collection.Get())); |
| + mswr::ComPtr<IDWriteFontFallback> fontFallback; |
|
scottmg
2016/04/13 23:18:33
font_fallback
Ilya Kulshin
2016/04/13 23:59:40
Done.
|
| + mswr::MakeAndInitialize<FontFallback>(&fontFallback, g_font_collection.Get(), |
| + g_sender_override); |
| + |
| + sk_sp<SkFontMgr> skia_font_manager(SkFontMgr_New_DirectWrite( |
| + factory.Get(), g_font_collection.Get(), fontFallback.Get())); |
| blink::WebFontRendering::setSkiaFontManager(skia_font_manager.get()); |
| // Add an extra ref for SetDefaultSkiaFactory, which keeps a ref but doesn't |