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

content/browser/renderer_host/render_message_filter.h

Index: content/browser/renderer_host/render_message_filter.h
===================================================================
--- content/browser/renderer_host/render_message_filter.h	(revision 112358)
+++ content/browser/renderer_host/render_message_filter.h	(working copy)
@@ -73,9 +73,6 @@
 
   // IPC::ChannelProxy::MessageFilter methods:
   virtual void OnChannelClosing() OVERRIDE;
-#if defined (OS_WIN)
-  virtual void OnChannelError() OVERRIDE;
-#endif
 
   // BrowserMessageFilter methods:
   virtual bool OnMessageReceived(const IPC::Message& message,
@@ -132,8 +129,7 @@
                   uint32* font_id);
 #endif
 
-#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.
   void OnGetScreenInfo(gfx::NativeViewId window,
@@ -142,15 +138,6 @@
   void OnGetRootWindowRect(gfx::NativeViewId window, gfx::Rect* rect);
 #endif
 
-  // This hack is Windows-specific.
-  // Cache fonts for the renderer. See RenderMessageFilter::OnPreCacheFont
-  // implementation for more details.
-  void OnPreCacheFont(const LOGFONT& font);
-
-  // Release fonts cached for renderer.
-  void OnReleaseCachedFonts();
-#endif
-
   void OnGetPlugins(bool refresh, IPC::Message* reply_msg);
   void GetPluginsCallback(IPC::Message* reply_msg,
                           const std::vector<webkit::WebPluginInfo>& plugins);