| Index: content/renderer/render_font_warmup_win.cc
|
| diff --git a/content/renderer/render_font_warmup_win.cc b/content/renderer/render_font_warmup_win.cc
|
| index 3fc90f19003015587b0a97bd13d53e92c4165f9b..91d83c363e403c6cf5bb2ca7ef5b363aacc510e9 100644
|
| --- a/content/renderer/render_font_warmup_win.cc
|
| +++ b/content/renderer/render_font_warmup_win.cc
|
| @@ -122,9 +122,9 @@ void PatchServiceManagerCalls() {
|
| service_provider_dll, "StartServiceW", StartServiceWPatch);
|
| DCHECK(patched == 0);
|
|
|
| - patched = g_iat_patch_nt_connect_port.Patch(L"dwrite.dll",
|
| - "ntdll.dll", "NtAlpcConnectPort", NtALpcConnectPortPatch);
|
| - DCHECK(patched == 0);
|
| + // patched = g_iat_patch_nt_connect_port.Patch(L"dwrite.dll",
|
| + // "ntdll.dll", "NtAlpcConnectPort", NtALpcConnectPortPatch);
|
| + // DCHECK(patched == 0);
|
| }
|
|
|
| // Windows-only DirectWrite support. These warm up the DirectWrite paths
|
| @@ -140,7 +140,7 @@ void CreateDirectWriteFactory(IDWriteFactory** factory) {
|
| CHECK(false);
|
| }
|
|
|
| - PatchServiceManagerCalls();
|
| + // PatchServiceManagerCalls();
|
|
|
| DWriteCreateFactoryProc dwrite_create_factory_proc =
|
| reinterpret_cast<DWriteCreateFactoryProc>(
|
| @@ -188,17 +188,22 @@ void DoPreSandboxWarmupForTypeface(SkTypeface* typeface) {
|
|
|
| SkFontMgr* GetPreSandboxWarmupFontMgr() {
|
| if (!g_warmup_fontmgr) {
|
| - IDWriteFactory* factory;
|
| - CreateDirectWriteFactory(&factory);
|
| + // PatchServiceManagerCalls();
|
| + // IDWriteFactory* factory;
|
| + // CreateDirectWriteFactory(&factory);
|
|
|
| - GetCustomFontCollection(factory);
|
| + // GetCustomFontCollection(factory);
|
|
|
| - PatchDWriteFactory(factory);
|
| + // PatchDWriteFactory(factory);
|
|
|
| - blink::WebFontRendering::setDirectWriteFactory(factory);
|
| - g_warmup_fontmgr = SkFontMgr_New_DirectWrite(factory);
|
| + blink::WebFontRendering::setDirectWriteFactory(NULL/*factory*/);
|
| + g_warmup_fontmgr = SkFontMgr_New_DirectWrite(NULL/*factory*/);
|
| }
|
| return g_warmup_fontmgr;
|
| }
|
|
|
| +void InitializeDirectWrite() {
|
| + PatchServiceManagerCalls();
|
| +}
|
| +
|
| } // namespace content
|
|
|