Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Side by Side Diff: ppapi/proxy/resource_creation_proxy.cc

Issue 7431001: Re-land r92885, which was reverted in r92891. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ppapi/proxy/resource_creation_proxy.h ('k') | ppapi/shared_impl/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ppapi/proxy/resource_creation_proxy.h" 5 #include "ppapi/proxy/resource_creation_proxy.h"
6 6
7 #include "ppapi/c/pp_errors.h" 7 #include "ppapi/c/pp_errors.h"
8 #include "ppapi/c/pp_size.h" 8 #include "ppapi/c/pp_size.h"
9 #include "ppapi/proxy/host_resource.h" 9 #include "ppapi/proxy/host_resource.h"
10 #include "ppapi/proxy/interface_id.h" 10 #include "ppapi/proxy/interface_id.h"
11 #include "ppapi/proxy/plugin_dispatcher.h" 11 #include "ppapi/proxy/plugin_dispatcher.h"
12 #include "ppapi/c/trusted/ppb_image_data_trusted.h" 12 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
13 #include "ppapi/proxy/plugin_resource_tracker.h" 13 #include "ppapi/proxy/plugin_resource_tracker.h"
14 #include "ppapi/proxy/ppapi_messages.h" 14 #include "ppapi/proxy/ppapi_messages.h"
15 #include "ppapi/proxy/ppb_audio_config_proxy.h" 15 #include "ppapi/proxy/ppb_audio_config_proxy.h"
16 #include "ppapi/proxy/ppb_audio_proxy.h" 16 #include "ppapi/proxy/ppb_audio_proxy.h"
17 #include "ppapi/proxy/ppb_buffer_proxy.h" 17 #include "ppapi/proxy/ppb_buffer_proxy.h"
18 #include "ppapi/proxy/ppb_broker_proxy.h" 18 #include "ppapi/proxy/ppb_broker_proxy.h"
19 #include "ppapi/proxy/ppb_context_3d_proxy.h" 19 #include "ppapi/proxy/ppb_context_3d_proxy.h"
20 #include "ppapi/proxy/ppb_file_chooser_proxy.h" 20 #include "ppapi/proxy/ppb_file_chooser_proxy.h"
21 #include "ppapi/proxy/ppb_file_ref_proxy.h" 21 #include "ppapi/proxy/ppb_file_ref_proxy.h"
22 #include "ppapi/proxy/ppb_file_system_proxy.h" 22 #include "ppapi/proxy/ppb_file_system_proxy.h"
23 #include "ppapi/proxy/ppb_flash_menu_proxy.h" 23 #include "ppapi/proxy/ppb_flash_menu_proxy.h"
24 #include "ppapi/proxy/ppb_flash_net_connector_proxy.h" 24 #include "ppapi/proxy/ppb_flash_net_connector_proxy.h"
25 #include "ppapi/proxy/ppb_flash_tcp_socket_proxy.h" 25 #include "ppapi/proxy/ppb_flash_tcp_socket_proxy.h"
26 #include "ppapi/proxy/ppb_font_proxy.h" 26 #include "ppapi/proxy/ppb_font_proxy.h"
27 #include "ppapi/proxy/ppb_graphics_2d_proxy.h" 27 #include "ppapi/proxy/ppb_graphics_2d_proxy.h"
28 #include "ppapi/proxy/ppb_graphics_3d_proxy.h"
28 #include "ppapi/proxy/ppb_image_data_proxy.h" 29 #include "ppapi/proxy/ppb_image_data_proxy.h"
29 #include "ppapi/proxy/ppb_surface_3d_proxy.h" 30 #include "ppapi/proxy/ppb_surface_3d_proxy.h"
30 #include "ppapi/proxy/ppb_url_loader_proxy.h" 31 #include "ppapi/proxy/ppb_url_loader_proxy.h"
31 #include "ppapi/proxy/ppb_url_request_info_proxy.h" 32 #include "ppapi/proxy/ppb_url_request_info_proxy.h"
32 #include "ppapi/shared_impl/font_impl.h" 33 #include "ppapi/shared_impl/font_impl.h"
33 #include "ppapi/shared_impl/function_group_base.h" 34 #include "ppapi/shared_impl/function_group_base.h"
34 #include "ppapi/thunk/enter.h" 35 #include "ppapi/thunk/enter.h"
35 #include "ppapi/thunk/ppb_image_data_api.h" 36 #include "ppapi/thunk/ppb_image_data_api.h"
36 37
37 using ppapi::thunk::ResourceCreationAPI; 38 using ppapi::thunk::ResourceCreationAPI;
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 187
187 linked_ptr<ImageData> object(new ImageData(result, desc, image_handle)); 188 linked_ptr<ImageData> object(new ImageData(result, desc, image_handle));
188 return PluginResourceTracker::GetInstance()->AddResource(object); 189 return PluginResourceTracker::GetInstance()->AddResource(object);
189 } 190 }
190 191
191 PP_Resource ResourceCreationProxy::CreateGraphics3D( 192 PP_Resource ResourceCreationProxy::CreateGraphics3D(
192 PP_Instance instance, 193 PP_Instance instance,
193 PP_Config3D_Dev config, 194 PP_Config3D_Dev config,
194 PP_Resource share_context, 195 PP_Resource share_context,
195 const int32_t* attrib_list) { 196 const int32_t* attrib_list) {
196 NOTIMPLEMENTED(); // Not proxied yet. 197 return PPB_Graphics3D_Proxy::CreateProxyResource(
198 instance, config, share_context, attrib_list);
199 }
200
201 PP_Resource ResourceCreationProxy::CreateGraphics3DRaw(
202 PP_Instance instance,
203 PP_Config3D_Dev config,
204 PP_Resource share_context,
205 const int32_t* attrib_list) {
206 // Not proxied. The raw creation function is used only in the implementation
207 // of the proxy on the host side.
197 return 0; 208 return 0;
198 } 209 }
199 210
200 PP_Resource ResourceCreationProxy::CreateScrollbar(PP_Instance instance, 211 PP_Resource ResourceCreationProxy::CreateScrollbar(PP_Instance instance,
201 PP_Bool vertical) { 212 PP_Bool vertical) {
202 NOTIMPLEMENTED(); // Not proxied yet. 213 NOTIMPLEMENTED(); // Not proxied yet.
203 return 0; 214 return 0;
204 } 215 }
205 216
206 PP_Resource ResourceCreationProxy::CreateSurface3D( 217 PP_Resource ResourceCreationProxy::CreateSurface3D(
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 *result_image_handle = dispatcher_->ShareHandleWithRemote(ih, false); 318 *result_image_handle = dispatcher_->ShareHandleWithRemote(ih, false);
308 #else 319 #else
309 *result_image_handle = ImageData::HandleFromInt(handle); 320 *result_image_handle = ImageData::HandleFromInt(handle);
310 #endif 321 #endif
311 } 322 }
312 } 323 }
313 } 324 }
314 325
315 } // namespace proxy 326 } // namespace proxy
316 } // namespace pp 327 } // namespace pp
OLDNEW
« no previous file with comments | « ppapi/proxy/resource_creation_proxy.h ('k') | ppapi/shared_impl/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698