Fix font loading in OOP PDF

chrome/renderer/chrome_render_process_observer.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 "chrome/renderer/chrome_render_process_observer.h"
 
 #include <limits>
 #include <vector>
 
 #include "base/allocator/allocator_extension.h"
@@ skipping 263 matching lines @@
   }
 
   RenderThread* thread = RenderThread::Get();
   resource_delegate_.reset(new RendererResourceDelegate());
   thread->SetResourceDispatcherDelegate(resource_delegate_.get());
 
   // Configure modules that need access to resources.
   net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider);
 
 #if defined(OS_WIN)
-  // Need to patch a few functions for font loading to work correctly.
-  base::FilePath pdf;
-  if (PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf) &&
-      base::PathExists(pdf)) {
-    g_iat_patch_createdca.Patch(
-        pdf.value().c_str(), "gdi32.dll", "CreateDCA", CreateDCAPatch);
-    g_iat_patch_get_font_data.Patch(
-        pdf.value().c_str(), "gdi32.dll", "GetFontData", GetFontDataPatch);
+  // TODO(scottmg): http://crbug.com/448473. This code should be removed once
+  // PDF is always OOP and/or PDF is made to use Skia instead of GDI directly.
+  if (!command_line.HasSwitch(switches::kEnableOutOfProcessPdf)) {
+    // Need to patch a few functions for font loading to work correctly.
+    base::FilePath pdf;
+    if (PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf) &&
+        base::PathExists(pdf)) {
+      g_iat_patch_createdca.Patch(pdf.value().c_str(), "gdi32.dll", "CreateDCA",
+                                  CreateDCAPatch);
+      g_iat_patch_get_font_data.Patch(pdf.value().c_str(), "gdi32.dll",
+                                      "GetFontData", GetFontDataPatch);
+    }
   }
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_NSS)
   // On platforms where we use system NSS shared libraries,
   // initialize NSS now because it won't be able to load the .so's
   // after we engage the sandbox.
   if (!command_line.HasSwitch(switches::kSingleProcess))
     crypto::InitNSSSafely();
 #elif defined(OS_WIN)
@@ skipping 76 matching lines @@
 }
 
 void ChromeRenderProcessObserver::OnGetV8HeapStats() {
   HeapStatisticsCollector::Instance()->InitiateCollection();
 }
 
 const RendererContentSettingRules*
 ChromeRenderProcessObserver::content_setting_rules() const {
   return &content_setting_rules_;
 }