| Index: content/renderer/renderer_main_platform_delegate_win.cc
|
| ===================================================================
|
| --- content/renderer/renderer_main_platform_delegate_win.cc (revision 258275)
|
| +++ content/renderer/renderer_main_platform_delegate_win.cc (working copy)
|
| @@ -12,12 +12,18 @@
|
| #include "content/public/common/content_switches.h"
|
| #include "content/public/common/injection_test_win.h"
|
| #include "content/public/renderer/render_thread.h"
|
| +#include "content/renderer/fontmgr_proxy.h"
|
| #include "content/renderer/render_thread_impl.h"
|
| #include "sandbox/win/src/sandbox.h"
|
| +#include "skia/ext/fontmgr_default_win.h"
|
| +#include "skia/ext/refptr.h"
|
| #include "skia/ext/vector_platform_device_emf_win.h"
|
| #include "third_party/icu/source/i18n/unicode/timezone.h"
|
| +#include "third_party/skia/include/ports/SkFontMgr_indirect.h"
|
| +#include "third_party/skia/include/ports/SkRemotableFontMgr.h"
|
| #include "third_party/skia/include/ports/SkTypeface_win.h"
|
|
|
| +
|
| #ifdef ENABLE_VTUNE_JIT_INTERFACE
|
| #include "v8/src/third_party/vtune/v8-vtune.h"
|
| #endif
|
| @@ -78,6 +84,13 @@
|
| SkTypeface_SetEnsureLOGFONTAccessibleProc(SkiaPreCacheFont);
|
| skia::SetSkiaEnsureTypefaceCharactersAccessible(
|
| SkiaPreCacheFontCharacters);
|
| +
|
| + skia::RefPtr<FontMgrProxy> proxy = skia::AdoptRef(new FontMgrProxy());
|
| + skia::RefPtr<SkFontMgr> dw_fontmgr =
|
| + skia::AdoptRef(SkFontMgr_New_DirectWriteRenderer(proxy.get()));
|
| + if (dw_fontmgr) {
|
| + SkSetFontMgr(dw_fontmgr.get());
|
| + }
|
| }
|
| }
|
|
|
|
|