OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ | 5 #ifndef CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ |
6 #define CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ | 6 #define CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 | 10 |
11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "base/process/process.h" | 14 #include "base/process/process.h" |
15 #include "base/scoped_native_library.h" | 15 #include "base/scoped_native_library.h" |
16 #include "build/build_config.h" | 16 #include "build/build_config.h" |
17 #include "content/child/child_thread.h" | 17 #include "content/child/child_thread.h" |
18 #include "content/public/common/pepper_plugin_info.h" | 18 #include "content/public/common/pepper_plugin_info.h" |
19 #include "ipc/ipc_listener.h" | 19 #include "ipc/ipc_listener.h" |
20 #include "ppapi/c/pp_module.h" | 20 #include "ppapi/c/pp_module.h" |
21 #include "ppapi/c/trusted/ppp_broker.h" | 21 #include "ppapi/c/trusted/ppp_broker.h" |
| 22 #include "ppapi/proxy/connection.h" |
22 #include "ppapi/proxy/plugin_dispatcher.h" | 23 #include "ppapi/proxy/plugin_dispatcher.h" |
23 #include "ppapi/proxy/plugin_globals.h" | 24 #include "ppapi/proxy/plugin_globals.h" |
24 #include "ppapi/proxy/plugin_proxy_delegate.h" | 25 #include "ppapi/proxy/plugin_proxy_delegate.h" |
25 | 26 |
26 #if defined(OS_WIN) | 27 #if defined(OS_WIN) |
27 #include "base/win/scoped_handle.h" | 28 #include "base/win/scoped_handle.h" |
28 #endif | 29 #endif |
29 | 30 |
30 class CommandLine; | 31 class CommandLine; |
31 | 32 |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 ppapi::proxy::PluginDispatcher* plugin_dispatcher) OVERRIDE; | 95 ppapi::proxy::PluginDispatcher* plugin_dispatcher) OVERRIDE; |
95 virtual void Unregister(uint32 plugin_dispatcher_id) OVERRIDE; | 96 virtual void Unregister(uint32 plugin_dispatcher_id) OVERRIDE; |
96 | 97 |
97 // PluginProxyDelegate. | 98 // PluginProxyDelegate. |
98 // SendToBrowser() is intended to be safe to use on another thread so | 99 // SendToBrowser() is intended to be safe to use on another thread so |
99 // long as the main PpapiThread outlives it. | 100 // long as the main PpapiThread outlives it. |
100 virtual IPC::Sender* GetBrowserSender() OVERRIDE; | 101 virtual IPC::Sender* GetBrowserSender() OVERRIDE; |
101 virtual std::string GetUILanguage() OVERRIDE; | 102 virtual std::string GetUILanguage() OVERRIDE; |
102 virtual void PreCacheFont(const void* logfontw) OVERRIDE; | 103 virtual void PreCacheFont(const void* logfontw) OVERRIDE; |
103 virtual void SetActiveURL(const std::string& url) OVERRIDE; | 104 virtual void SetActiveURL(const std::string& url) OVERRIDE; |
| 105 virtual PP_Resource CreateBrowserFont( |
| 106 ppapi::proxy::Connection connection, |
| 107 PP_Instance instance, |
| 108 const PP_BrowserFont_Trusted_Description& desc, |
| 109 const ppapi::Preferences& prefs) OVERRIDE; |
104 | 110 |
105 // Message handlers. | 111 // Message handlers. |
106 void OnLoadPlugin(const base::FilePath& path, | 112 void OnLoadPlugin(const base::FilePath& path, |
107 const ppapi::PpapiPermissions& permissions); | 113 const ppapi::PpapiPermissions& permissions); |
108 void OnCreateChannel(base::ProcessId renderer_pid, | 114 void OnCreateChannel(base::ProcessId renderer_pid, |
109 int renderer_child_id, | 115 int renderer_child_id, |
110 bool incognito); | 116 bool incognito); |
111 void OnResourceReply( | 117 void OnResourceReply( |
112 const ppapi::proxy::ResourceMessageReplyParams& reply_params, | 118 const ppapi::proxy::ResourceMessageReplyParams& reply_params, |
113 const IPC::Message& nested_msg); | 119 const IPC::Message& nested_msg); |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 #endif | 174 #endif |
169 | 175 |
170 DispatcherMessageListener dispatcher_message_listener_; | 176 DispatcherMessageListener dispatcher_message_listener_; |
171 | 177 |
172 DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread); | 178 DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread); |
173 }; | 179 }; |
174 | 180 |
175 } // namespace content | 181 } // namespace content |
176 | 182 |
177 #endif // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ | 183 #endif // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ |
OLD | NEW |