Merge 131324 - Mac: OOP font loading should run on FILE thread.

content/browser/renderer_host/render_message_filter.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_MESSAGE_FILTER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_MESSAGE_FILTER_H_
 #pragma once
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/memory/linked_ptr.h"
 #include "base/message_loop_helpers.h"
 #include "base/shared_memory.h"
 #include "base/string16.h"
 #include "build/build_config.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "media/base/channel_layout.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/surface/transport_dib.h"
 
+#if defined(OS_MACOSX)
+#include "content/common/mac/font_loader.h"
+#endif
+
 class DOMStorageContextImpl;
 class PluginServiceImpl;
 class RenderWidgetHelper;
 struct FontDescriptor;
 struct ViewHostMsg_CreateWindow_Params;
 
 namespace WebKit {
 struct WebScreenInfo;
 }
 
@@ skipping 85 matching lines @@
   void OnGetRawCookies(const GURL& url,
                        const GURL& first_party_for_cookies,
                        IPC::Message* reply_msg);
   void OnDeleteCookie(const GURL& url,
                       const std::string& cookieName);
   void OnCookiesEnabled(const GURL& url,
                         const GURL& first_party_for_cookies,
                         bool* cookies_enabled);
 
 #if defined(OS_MACOSX)
-  void OnLoadFont(const FontDescriptor& font,
-                  uint32* handle_size,
-                  base::SharedMemoryHandle* handle,
-                  uint32* font_id);
+  // Messages for OOP font loading.
+  void OnLoadFont(const FontDescriptor& font, IPC::Message* reply_msg);
+  void SendLoadFontReply(IPC::Message* reply, FontLoader::Result* result);
 #endif
 
 #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 OnGetWindowRect(gfx::NativeViewId window, gfx::Rect* rect);
   void OnGetRootWindowRect(gfx::NativeViewId window, gfx::Rect* rect);
 #endif
 
   void OnGetPlugins(bool refresh, IPC::Message* reply_msg);
@@ skipping 119 matching lines @@
   int cpu_usage_;
   // Used for sampling CPU usage of the renderer process.
   scoped_ptr<base::ProcessMetrics> process_metrics_;
 
   content::MediaObserver* media_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderMessageFilter);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_MESSAGE_FILTER_H_