Continuing changes for lpc proxy

content/renderer/renderer_main_platform_delegate_win.cc

 // Copyright (c) 2012 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/renderer/renderer_main_platform_delegate.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
@@ skipping 24 matching lines @@
 // Windows-only skia sandbox support
 // These are used for GDI-path rendering.
 void SkiaPreCacheFont(const LOGFONT& logfont) {
   RenderThread* render_thread = RenderThread::Get();
   if (render_thread) {
     render_thread->PreCacheFont(logfont);
   }
 }
 
 void WarmupDirectWrite() {
+  InitializeDirectWrite();
+}
+
+void CreateDirectWriteGlobalFactory() {
   // The objects used here are intentionally not freed as we want the Skia
   // code to use these objects after warmup.
   SetDefaultSkiaFactory(GetPreSandboxWarmupFontMgr());
 
+#if 0
   // We need to warm up *some* font for DirectWrite. We also need to pass one
   // down for the CC HUD code, so use the same one here. 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());
   gfx::SetHudTypeface(hud_typeface);
+#endif
 }
 
 }  // namespace
 
 RendererMainPlatformDelegate::RendererMainPlatformDelegate(
     const MainFunctionParams& parameters)
         : parameters_(parameters),
           sandbox_test_module_(NULL) {
 }
 
@@ skipping 35 matching lines @@
       parameters_.sandbox_info->target_services;
 
   if (target_services) {
     // Cause advapi32 to load before the sandbox is turned on.
     unsigned int dummy_rand;
     rand_s(&dummy_rand);
     // Warm up language subsystems before the sandbox is turned on.
     ::GetUserDefaultLangID();
     ::GetUserDefaultLCID();
 
-    target_services->LowerToken();
+    // target_services->LowerToken();
+
+    if (gfx::win::ShouldUseDirectWrite())
+      CreateDirectWriteGlobalFactory();
     return true;
   }
   return false;
 }
 
 }  // namespace content