OLD | NEW |
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/dispatcher.h" | 5 #include "ppapi/proxy/dispatcher.h" |
6 | 6 |
7 #include <string.h> // For memset. | 7 #include <string.h> // For memset. |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 | 10 |
11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/singleton.h" | 13 #include "base/singleton.h" |
14 #include "ipc/ipc_message.h" | 14 #include "ipc/ipc_message.h" |
15 #include "ipc/ipc_sync_channel.h" | 15 #include "ipc/ipc_sync_channel.h" |
16 #include "ipc/ipc_test_sink.h" | 16 #include "ipc/ipc_test_sink.h" |
17 #include "ppapi/c/dev/ppb_buffer_dev.h" | 17 #include "ppapi/c/dev/ppb_buffer_dev.h" |
18 #include "ppapi/c/dev/ppb_char_set_dev.h" | 18 #include "ppapi/c/dev/ppb_char_set_dev.h" |
19 #include "ppapi/c/dev/ppb_context_3d_dev.h" | 19 #include "ppapi/c/dev/ppb_context_3d_dev.h" |
20 #include "ppapi/c/dev/ppb_cursor_control_dev.h" | 20 #include "ppapi/c/dev/ppb_cursor_control_dev.h" |
21 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h" | 21 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h" |
22 #include "ppapi/c/dev/ppb_font_dev.h" | 22 #include "ppapi/c/dev/ppb_font_dev.h" |
23 #include "ppapi/c/dev/ppb_fullscreen_dev.h" | 23 #include "ppapi/c/dev/ppb_fullscreen_dev.h" |
24 #include "ppapi/c/dev/ppb_opengles_dev.h" | 24 #include "ppapi/c/dev/ppb_opengles_dev.h" |
25 #include "ppapi/c/dev/ppb_surface_3d_dev.h" | 25 #include "ppapi/c/dev/ppb_surface_3d_dev.h" |
26 #include "ppapi/c/dev/ppb_testing_dev.h" | 26 #include "ppapi/c/dev/ppb_testing_dev.h" |
| 27 #include "ppapi/c/dev/ppb_url_util_dev.h" |
27 #include "ppapi/c/dev/ppb_var_deprecated.h" | 28 #include "ppapi/c/dev/ppb_var_deprecated.h" |
28 #include "ppapi/c/pp_errors.h" | 29 #include "ppapi/c/pp_errors.h" |
29 #include "ppapi/c/ppb_audio.h" | 30 #include "ppapi/c/ppb_audio.h" |
30 #include "ppapi/c/ppb_audio_config.h" | 31 #include "ppapi/c/ppb_audio_config.h" |
31 #include "ppapi/c/ppb_core.h" | 32 #include "ppapi/c/ppb_core.h" |
32 #include "ppapi/c/ppb_graphics_2d.h" | 33 #include "ppapi/c/ppb_graphics_2d.h" |
33 #include "ppapi/c/ppb_image_data.h" | 34 #include "ppapi/c/ppb_image_data.h" |
34 #include "ppapi/c/ppb_instance.h" | 35 #include "ppapi/c/ppb_instance.h" |
35 #include "ppapi/c/ppb_url_loader.h" | 36 #include "ppapi/c/ppb_url_loader.h" |
36 #include "ppapi/c/ppb_url_request_info.h" | 37 #include "ppapi/c/ppb_url_request_info.h" |
(...skipping 27 matching lines...) Expand all Loading... |
64 #include "ppapi/proxy/ppb_graphics_2d_proxy.h" | 65 #include "ppapi/proxy/ppb_graphics_2d_proxy.h" |
65 #include "ppapi/proxy/ppb_image_data_proxy.h" | 66 #include "ppapi/proxy/ppb_image_data_proxy.h" |
66 #include "ppapi/proxy/ppb_instance_proxy.h" | 67 #include "ppapi/proxy/ppb_instance_proxy.h" |
67 #include "ppapi/proxy/ppb_opengles2_proxy.h" | 68 #include "ppapi/proxy/ppb_opengles2_proxy.h" |
68 #include "ppapi/proxy/ppb_pdf_proxy.h" | 69 #include "ppapi/proxy/ppb_pdf_proxy.h" |
69 #include "ppapi/proxy/ppb_surface_3d_proxy.h" | 70 #include "ppapi/proxy/ppb_surface_3d_proxy.h" |
70 #include "ppapi/proxy/ppb_testing_proxy.h" | 71 #include "ppapi/proxy/ppb_testing_proxy.h" |
71 #include "ppapi/proxy/ppb_url_loader_proxy.h" | 72 #include "ppapi/proxy/ppb_url_loader_proxy.h" |
72 #include "ppapi/proxy/ppb_url_request_info_proxy.h" | 73 #include "ppapi/proxy/ppb_url_request_info_proxy.h" |
73 #include "ppapi/proxy/ppb_url_response_info_proxy.h" | 74 #include "ppapi/proxy/ppb_url_response_info_proxy.h" |
| 75 #include "ppapi/proxy/ppb_url_util_proxy.h" |
74 #include "ppapi/proxy/ppb_var_deprecated_proxy.h" | 76 #include "ppapi/proxy/ppb_var_deprecated_proxy.h" |
75 #include "ppapi/proxy/ppp_class_proxy.h" | 77 #include "ppapi/proxy/ppp_class_proxy.h" |
76 #include "ppapi/proxy/ppp_instance_proxy.h" | 78 #include "ppapi/proxy/ppp_instance_proxy.h" |
77 #include "ppapi/proxy/var_serialization_rules.h" | 79 #include "ppapi/proxy/var_serialization_rules.h" |
78 | 80 |
79 namespace pp { | 81 namespace pp { |
80 namespace proxy { | 82 namespace proxy { |
81 | 83 |
82 namespace { | 84 namespace { |
83 | 85 |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 AddPPB(PPB_ImageData_Proxy::GetInfo()); | 127 AddPPB(PPB_ImageData_Proxy::GetInfo()); |
126 AddPPB(PPB_Instance_Proxy::GetInfo()); | 128 AddPPB(PPB_Instance_Proxy::GetInfo()); |
127 AddPPB(PPB_OpenGLES2_Proxy::GetInfo()); | 129 AddPPB(PPB_OpenGLES2_Proxy::GetInfo()); |
128 AddPPB(PPB_PDF_Proxy::GetInfo()); | 130 AddPPB(PPB_PDF_Proxy::GetInfo()); |
129 AddPPB(PPB_Surface3D_Proxy::GetInfo()); | 131 AddPPB(PPB_Surface3D_Proxy::GetInfo()); |
130 AddPPB(PPB_Testing_Proxy::GetInfo()); | 132 AddPPB(PPB_Testing_Proxy::GetInfo()); |
131 AddPPB(PPB_URLLoader_Proxy::GetInfo()); | 133 AddPPB(PPB_URLLoader_Proxy::GetInfo()); |
132 AddPPB(PPB_URLLoaderTrusted_Proxy::GetInfo()); | 134 AddPPB(PPB_URLLoaderTrusted_Proxy::GetInfo()); |
133 AddPPB(PPB_URLRequestInfo_Proxy::GetInfo()); | 135 AddPPB(PPB_URLRequestInfo_Proxy::GetInfo()); |
134 AddPPB(PPB_URLResponseInfo_Proxy::GetInfo()); | 136 AddPPB(PPB_URLResponseInfo_Proxy::GetInfo()); |
| 137 AddPPB(PPB_URLUtil_Proxy::GetInfo()); |
135 AddPPB(PPB_Var_Deprecated_Proxy::GetInfo()); | 138 AddPPB(PPB_Var_Deprecated_Proxy::GetInfo()); |
136 | 139 |
137 // PPP (plugin) interfaces. | 140 // PPP (plugin) interfaces. |
138 AddPPP(PPP_Instance_Proxy::GetInfo()); | 141 AddPPP(PPP_Instance_Proxy::GetInfo()); |
139 } | 142 } |
140 | 143 |
141 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) { | 144 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) { |
142 DCHECK(name_to_plugin_info_.find(info->name) == | 145 DCHECK(name_to_plugin_info_.find(info->name) == |
143 name_to_plugin_info_.end()); | 146 name_to_plugin_info_.end()); |
144 DCHECK(info->id > 0 && info->id < INTERFACE_ID_COUNT); | 147 DCHECK(info->id > 0 && info->id < INTERFACE_ID_COUNT); |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
293 return channel_->Send(msg); | 296 return channel_->Send(msg); |
294 | 297 |
295 // Remote side crashed, drop this message. | 298 // Remote side crashed, drop this message. |
296 delete msg; | 299 delete msg; |
297 return false; | 300 return false; |
298 } | 301 } |
299 | 302 |
300 } // namespace proxy | 303 } // namespace proxy |
301 } // namespace pp | 304 } // namespace pp |
302 | 305 |
OLD | NEW |