Continuing changes for lpc proxy

content/renderer/render_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/public/renderer/render_font_warmup_win.h"
 
 #include <dwrite.h>
 
 #include "base/debug/alias.h"
 #include "base/logging.h"
@@ skipping 104 matching lines @@
   DCHECK(patched == 0);
 
   patched = g_iat_patch_open_service.Patch(L"dwrite.dll",
       service_provider_dll, "OpenServiceW", OpenServiceWPatch);
   DCHECK(patched == 0);
 
   patched = g_iat_patch_start_service.Patch(L"dwrite.dll",
       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
 // before sandbox lock down to allow Skia access to the Font Manager service.
 void CreateDirectWriteFactory(IDWriteFactory** factory) {
   typedef decltype(DWriteCreateFactory)* DWriteCreateFactoryProc;
   HMODULE dwrite_dll = LoadLibraryW(L"dwrite.dll");
   // TODO(scottmg): Temporary code to track crash in http://crbug.com/387867.
   if (!dwrite_dll) {
     DWORD load_library_get_last_error = GetLastError();
     base::debug::Alias(&dwrite_dll);
     base::debug::Alias(&load_library_get_last_error);
     CHECK(false);
   }
 
-  PatchServiceManagerCalls();
+  // PatchServiceManagerCalls();
 
   DWriteCreateFactoryProc dwrite_create_factory_proc =
       reinterpret_cast<DWriteCreateFactoryProc>(
           GetProcAddress(dwrite_dll, "DWriteCreateFactory"));
   // TODO(scottmg): Temporary code to track crash in http://crbug.com/387867.
   if (!dwrite_create_factory_proc) {
     DWORD get_proc_address_get_last_error = GetLastError();
     base::debug::Alias(&dwrite_create_factory_proc);
     base::debug::Alias(&get_proc_address_get_last_error);
     CHECK(false);
@@ skipping 27 matching lines @@
 
 void DoPreSandboxWarmupForTypeface(SkTypeface* typeface) {
   SkPaint paint_warmup;
   paint_warmup.setTypeface(typeface);
   wchar_t glyph = L'S';
   paint_warmup.measureText(&glyph, 2);
 }
 
 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