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 #include "content/browser/renderer_host/pepper/content_browser_pepper_host_facto
ry.h" | 5 #include "content/browser/renderer_host/pepper/content_browser_pepper_host_facto
ry.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> |
8 | 9 |
9 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" | 10 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" |
10 #include "content/browser/renderer_host/pepper/pepper_browser_font_singleton_hos
t.h" | 11 #include "content/browser/renderer_host/pepper/pepper_browser_font_singleton_hos
t.h" |
11 #include "content/browser/renderer_host/pepper/pepper_file_io_host.h" | 12 #include "content/browser/renderer_host/pepper/pepper_file_io_host.h" |
12 #include "content/browser/renderer_host/pepper/pepper_file_ref_host.h" | 13 #include "content/browser/renderer_host/pepper/pepper_file_ref_host.h" |
13 #include "content/browser/renderer_host/pepper/pepper_file_system_browser_host.h
" | 14 #include "content/browser/renderer_host/pepper/pepper_file_system_browser_host.h
" |
14 #include "content/browser/renderer_host/pepper/pepper_flash_file_message_filter.
h" | 15 #include "content/browser/renderer_host/pepper/pepper_flash_file_message_filter.
h" |
15 #include "content/browser/renderer_host/pepper/pepper_gamepad_host.h" | 16 #include "content/browser/renderer_host/pepper/pepper_gamepad_host.h" |
16 #include "content/browser/renderer_host/pepper/pepper_host_resolver_message_filt
er.h" | 17 #include "content/browser/renderer_host/pepper/pepper_host_resolver_message_filt
er.h" |
17 #include "content/browser/renderer_host/pepper/pepper_network_monitor_host.h" | 18 #include "content/browser/renderer_host/pepper/pepper_network_monitor_host.h" |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 } | 130 } |
130 } | 131 } |
131 | 132 |
132 // Dev interfaces. | 133 // Dev interfaces. |
133 if (GetPermissions().HasPermission(ppapi::PERMISSION_DEV)) { | 134 if (GetPermissions().HasPermission(ppapi::PERMISSION_DEV)) { |
134 switch (message.type()) { | 135 switch (message.type()) { |
135 case PpapiHostMsg_Printing_Create::ID: { | 136 case PpapiHostMsg_Printing_Create::ID: { |
136 scoped_ptr<PepperPrintSettingsManager> manager( | 137 scoped_ptr<PepperPrintSettingsManager> manager( |
137 new PepperPrintSettingsManagerImpl()); | 138 new PepperPrintSettingsManagerImpl()); |
138 return scoped_ptr<ResourceHost>(new PepperPrintingHost( | 139 return scoped_ptr<ResourceHost>(new PepperPrintingHost( |
139 host_->GetPpapiHost(), instance, resource, manager.Pass())); | 140 host_->GetPpapiHost(), instance, resource, std::move(manager))); |
140 } | 141 } |
141 case PpapiHostMsg_TrueTypeFont_Create::ID: { | 142 case PpapiHostMsg_TrueTypeFont_Create::ID: { |
142 SerializedTrueTypeFontDesc desc; | 143 SerializedTrueTypeFontDesc desc; |
143 if (!UnpackMessage<PpapiHostMsg_TrueTypeFont_Create>(message, &desc)) { | 144 if (!UnpackMessage<PpapiHostMsg_TrueTypeFont_Create>(message, &desc)) { |
144 NOTREACHED(); | 145 NOTREACHED(); |
145 return scoped_ptr<ResourceHost>(); | 146 return scoped_ptr<ResourceHost>(); |
146 } | 147 } |
147 // Check that the family name is valid UTF-8 before passing it to the | 148 // Check that the family name is valid UTF-8 before passing it to the |
148 // host OS. | 149 // host OS. |
149 if (!base::IsStringUTF8(desc.family)) | 150 if (!base::IsStringUTF8(desc.family)) |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 } | 226 } |
226 | 227 |
227 scoped_ptr<ppapi::host::ResourceHost> | 228 scoped_ptr<ppapi::host::ResourceHost> |
228 ContentBrowserPepperHostFactory::CreateAcceptedTCPSocket( | 229 ContentBrowserPepperHostFactory::CreateAcceptedTCPSocket( |
229 PP_Instance instance, | 230 PP_Instance instance, |
230 ppapi::TCPSocketVersion version, | 231 ppapi::TCPSocketVersion version, |
231 scoped_ptr<net::TCPSocket> socket) { | 232 scoped_ptr<net::TCPSocket> socket) { |
232 if (!CanCreateSocket()) | 233 if (!CanCreateSocket()) |
233 return scoped_ptr<ResourceHost>(); | 234 return scoped_ptr<ResourceHost>(); |
234 scoped_refptr<ResourceMessageFilter> tcp_socket( | 235 scoped_refptr<ResourceMessageFilter> tcp_socket( |
235 new PepperTCPSocketMessageFilter( | 236 new PepperTCPSocketMessageFilter(host_, instance, version, |
236 host_, instance, version, socket.Pass())); | 237 std::move(socket))); |
237 return scoped_ptr<ResourceHost>( | 238 return scoped_ptr<ResourceHost>( |
238 new MessageFilterHost(host_->GetPpapiHost(), instance, 0, tcp_socket)); | 239 new MessageFilterHost(host_->GetPpapiHost(), instance, 0, tcp_socket)); |
239 } | 240 } |
240 | 241 |
241 scoped_ptr<ppapi::host::ResourceHost> | 242 scoped_ptr<ppapi::host::ResourceHost> |
242 ContentBrowserPepperHostFactory::CreateNewTCPSocket( | 243 ContentBrowserPepperHostFactory::CreateNewTCPSocket( |
243 PP_Instance instance, | 244 PP_Instance instance, |
244 PP_Resource resource, | 245 PP_Resource resource, |
245 ppapi::TCPSocketVersion version) { | 246 ppapi::TCPSocketVersion version) { |
246 if (!CanCreateSocket()) | 247 if (!CanCreateSocket()) |
247 return scoped_ptr<ResourceHost>(); | 248 return scoped_ptr<ResourceHost>(); |
248 | 249 |
249 scoped_refptr<ResourceMessageFilter> tcp_socket( | 250 scoped_refptr<ResourceMessageFilter> tcp_socket( |
250 new PepperTCPSocketMessageFilter(this, host_, instance, version)); | 251 new PepperTCPSocketMessageFilter(this, host_, instance, version)); |
251 if (!tcp_socket.get()) | 252 if (!tcp_socket.get()) |
252 return scoped_ptr<ResourceHost>(); | 253 return scoped_ptr<ResourceHost>(); |
253 | 254 |
254 return scoped_ptr<ResourceHost>(new MessageFilterHost( | 255 return scoped_ptr<ResourceHost>(new MessageFilterHost( |
255 host_->GetPpapiHost(), instance, resource, tcp_socket)); | 256 host_->GetPpapiHost(), instance, resource, tcp_socket)); |
256 } | 257 } |
257 | 258 |
258 const ppapi::PpapiPermissions& ContentBrowserPepperHostFactory::GetPermissions() | 259 const ppapi::PpapiPermissions& ContentBrowserPepperHostFactory::GetPermissions() |
259 const { | 260 const { |
260 return host_->GetPpapiHost()->permissions(); | 261 return host_->GetPpapiHost()->permissions(); |
261 } | 262 } |
262 | 263 |
263 } // namespace content | 264 } // namespace content |
OLD | NEW |