Dispatch the Windows font caching IPCs in one filter. This avoids having the code that calls thos...

content/browser/renderer_host/render_message_filter.cc

Index: content/browser/renderer_host/render_message_filter.cc
===================================================================
--- content/browser/renderer_host/render_message_filter.cc	(revision 112358)
+++ content/browser/renderer_host/render_message_filter.cc	(working copy)
@@ -297,18 +297,11 @@
   plugin_host_clients_.clear();
 }
 
-#if defined (OS_WIN)
-void RenderMessageFilter::OnChannelError() {
-  ChildProcessHost::ReleaseCachedFonts(render_process_id_);
-}
-#endif
-
 bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message,
                                             bool* message_was_ok) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(RenderMessageFilter, message, *message_was_ok)
-#if defined(OS_WIN)
-#if !defined(USE_AURA)
+#if defined(OS_WIN) && !defined(USE_AURA)
     // On Windows, we handle these on the IO thread to avoid a deadlock with
     // plugins.  On non-Windows systems, we need to handle them on the UI
     // thread.
@@ -316,13 +309,6 @@
     IPC_MESSAGE_HANDLER(ViewHostMsg_GetWindowRect, OnGetWindowRect)
     IPC_MESSAGE_HANDLER(ViewHostMsg_GetRootWindowRect, OnGetRootWindowRect)
 #endif
-
-    // This hack is Windows-specific.
-    IPC_MESSAGE_HANDLER(ChildProcessHostMsg_PreCacheFont, OnPreCacheFont)
-    IPC_MESSAGE_HANDLER(ChildProcessHostMsg_ReleaseCachedFonts,
-                        OnReleaseCachedFonts)
-#endif
-
     IPC_MESSAGE_HANDLER(ViewHostMsg_GenerateRoutingID, OnGenerateRoutingID)
     IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWindow, OnMsgCreateWindow)
     IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWidget, OnMsgCreateWidget)
@@ -522,16 +508,6 @@
 }
 #endif  // OS_MACOSX
 
-#if defined(OS_WIN)  // This hack is Windows-specific.
-void RenderMessageFilter::OnPreCacheFont(const LOGFONT& font) {
-  ChildProcessHost::PreCacheFont(font, render_process_id_);
-}
-
-void RenderMessageFilter::OnReleaseCachedFonts() {
-  ChildProcessHost::ReleaseCachedFonts(render_process_id_);
-}
-#endif  // OS_WIN
-
 void RenderMessageFilter::OnGetPlugins(
     bool refresh,
     IPC::Message* reply_msg) {