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

content/common/child_process_host.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_COMMON_CHILD_PROCESS_HOST_H_
 #define CONTENT_COMMON_CHILD_PROCESS_HOST_H_
 #pragma once
 
 #include <string>
 #include <vector>
-#include <map>
 
 #include "build/build_config.h"
 
-#if defined(OS_WIN)
-#include <windows.h>
-#endif  // defined(OS_WIN)
-
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/shared_memory.h"
 #include "base/string16.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_channel_proxy.h"
 
 class FilePath;
 
@@ skipping 49 matching lines @@
   // the default child process pathname will be returned.  On most platforms,
   // this will be the same as the currently-executing process.
   //
   // The |flags| argument accepts one or more flags such as CHILD_ALLOW_SELF
   // and CHILD_ALLOW_HEAP_EXECUTION as defined above. Pass only CHILD_NORMAL
   // if none of these special behaviors are required.
   //
   // On failure, returns an empty FilePath.
   static FilePath GetChildPath(int flags);
 
-#if defined(OS_WIN)
-  // See comments in the cc file. This is a common hack needed for a process
-  // hosting a sandboxed child process. Hence it lives in this file.
-  static void PreCacheFont(LOGFONT font, int pid);
-  static void ReleaseCachedFonts(int pid);
-#endif  // defined(OS_WIN)
-
   // IPC::Message::Sender implementation.
   virtual bool Send(IPC::Message* message) OVERRIDE;
 
   // Adds an IPC message filter.  A reference will be kept to the filter.
   void AddFilter(IPC::ChannelProxy::MessageFilter* filter);
 
   // Public and static for reuse by RenderMessageFilter.
   static void OnAllocateSharedMemory(
       uint32 buffer_size, base::ProcessHandle child_process,
       base::SharedMemoryHandle* handle);
@@ skipping 53 matching lines @@
     void OnShutdownRequest();
     void OnAllocateSharedMemory(uint32 buffer_size,
                                 base::SharedMemoryHandle* handle);
     ChildProcessHost* host_;
     base::ProcessHandle peer_handle_;
     DISALLOW_COPY_AND_ASSIGN(ListenerHook);
   };
 
   ListenerHook listener_;
 
-#if defined (OS_WIN)
-  class FontCache {
-   public:
-    static FontCache* GetInstance();
-    void PreCacheFont(LOGFONT font, int process_id);
-    void ReleaseCachedFonts(int process_id);
-
-   private:
-    struct CacheElement {
-      CacheElement();
-      ~CacheElement();
-
-      HFONT font_;
-      HDC dc_;
-      int ref_count_;
-    };
-    friend struct DefaultSingletonTraits<FontCache>;
-
-    FontCache();
-    ~FontCache();
-
-    std::map<string16, CacheElement> cache_;
-    std::map<int, std::vector<string16> > process_id_font_map_;
-    base::Lock mutex_;
-
-    DISALLOW_COPY_AND_ASSIGN(FontCache);
-  };
-#endif
-
   bool opening_channel_;  // True while we're waiting the channel to be opened.
   scoped_ptr<IPC::Channel> channel_;
   std::string channel_id_;
 
   // Holds all the IPC message filters.  Since this object lives on the IO
   // thread, we don't have a IPC::ChannelProxy and so we manage filters
   // manually.
   std::vector<scoped_refptr<IPC::ChannelProxy::MessageFilter> > filters_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessHost);
 };
 
 #endif  // CONTENT_COMMON_CHILD_PROCESS_HOST_H_