| 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 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 #include "ppapi/proxy/ppb_opengles2_proxy.h" | 73 #include "ppapi/proxy/ppb_opengles2_proxy.h" |
| 74 #include "ppapi/proxy/ppb_pdf_proxy.h" | 74 #include "ppapi/proxy/ppb_pdf_proxy.h" |
| 75 #include "ppapi/proxy/ppb_surface_3d_proxy.h" | 75 #include "ppapi/proxy/ppb_surface_3d_proxy.h" |
| 76 #include "ppapi/proxy/ppb_testing_proxy.h" | 76 #include "ppapi/proxy/ppb_testing_proxy.h" |
| 77 #include "ppapi/proxy/ppb_url_loader_proxy.h" | 77 #include "ppapi/proxy/ppb_url_loader_proxy.h" |
| 78 #include "ppapi/proxy/ppb_url_request_info_proxy.h" | 78 #include "ppapi/proxy/ppb_url_request_info_proxy.h" |
| 79 #include "ppapi/proxy/ppb_url_response_info_proxy.h" | 79 #include "ppapi/proxy/ppb_url_response_info_proxy.h" |
| 80 #include "ppapi/proxy/ppb_url_util_proxy.h" | 80 #include "ppapi/proxy/ppb_url_util_proxy.h" |
| 81 #include "ppapi/proxy/ppb_var_deprecated_proxy.h" | 81 #include "ppapi/proxy/ppb_var_deprecated_proxy.h" |
| 82 #include "ppapi/proxy/ppb_var_proxy.h" | 82 #include "ppapi/proxy/ppb_var_proxy.h" |
| 83 #include "ppapi/proxy/ppb_video_capture_proxy.h" |
| 83 #include "ppapi/proxy/ppb_video_decoder_proxy.h" | 84 #include "ppapi/proxy/ppb_video_decoder_proxy.h" |
| 84 #include "ppapi/proxy/ppp_class_proxy.h" | 85 #include "ppapi/proxy/ppp_class_proxy.h" |
| 85 #include "ppapi/proxy/ppp_graphics_3d_proxy.h" | 86 #include "ppapi/proxy/ppp_graphics_3d_proxy.h" |
| 86 #include "ppapi/proxy/ppp_input_event_proxy.h" | 87 #include "ppapi/proxy/ppp_input_event_proxy.h" |
| 87 #include "ppapi/proxy/ppp_instance_private_proxy.h" | 88 #include "ppapi/proxy/ppp_instance_private_proxy.h" |
| 88 #include "ppapi/proxy/ppp_instance_proxy.h" | 89 #include "ppapi/proxy/ppp_instance_proxy.h" |
| 89 #include "ppapi/proxy/ppp_messaging_proxy.h" | 90 #include "ppapi/proxy/ppp_messaging_proxy.h" |
| 90 #include "ppapi/proxy/ppp_video_decoder_proxy.h" | 91 #include "ppapi/proxy/ppp_video_decoder_proxy.h" |
| 91 #include "ppapi/proxy/var_serialization_rules.h" | 92 #include "ppapi/proxy/var_serialization_rules.h" |
| 92 | 93 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 AddPPB(PPB_PDF_Proxy::GetInfo()); | 158 AddPPB(PPB_PDF_Proxy::GetInfo()); |
| 158 AddPPB(PPB_Surface3D_Proxy::GetInfo()); | 159 AddPPB(PPB_Surface3D_Proxy::GetInfo()); |
| 159 AddPPB(PPB_Testing_Proxy::GetInfo()); | 160 AddPPB(PPB_Testing_Proxy::GetInfo()); |
| 160 AddPPB(PPB_URLLoader_Proxy::GetInfo()); | 161 AddPPB(PPB_URLLoader_Proxy::GetInfo()); |
| 161 AddPPB(PPB_URLLoader_Proxy::GetTrustedInfo()); | 162 AddPPB(PPB_URLLoader_Proxy::GetTrustedInfo()); |
| 162 AddPPB(PPB_URLRequestInfo_Proxy::GetInfo()); | 163 AddPPB(PPB_URLRequestInfo_Proxy::GetInfo()); |
| 163 AddPPB(PPB_URLResponseInfo_Proxy::GetInfo()); | 164 AddPPB(PPB_URLResponseInfo_Proxy::GetInfo()); |
| 164 AddPPB(PPB_URLUtil_Proxy::GetInfo()); | 165 AddPPB(PPB_URLUtil_Proxy::GetInfo()); |
| 165 AddPPB(PPB_Var_Deprecated_Proxy::GetInfo()); | 166 AddPPB(PPB_Var_Deprecated_Proxy::GetInfo()); |
| 166 AddPPB(PPB_Var_Proxy::GetInfo()); | 167 AddPPB(PPB_Var_Proxy::GetInfo()); |
| 168 AddPPB(PPB_VideoCapture_Proxy::GetInfo()); |
| 167 AddPPB(PPB_VideoDecoder_Proxy::GetInfo()); | 169 AddPPB(PPB_VideoDecoder_Proxy::GetInfo()); |
| 168 | 170 |
| 169 #ifdef ENABLE_FLAPPER_HACKS | 171 #ifdef ENABLE_FLAPPER_HACKS |
| 170 AddPPB(PPB_Flash_NetConnector_Proxy::GetInfo()); | 172 AddPPB(PPB_Flash_NetConnector_Proxy::GetInfo()); |
| 171 #endif | 173 #endif |
| 172 | 174 |
| 173 // PPP (plugin) interfaces. | 175 // PPP (plugin) interfaces. |
| 174 AddPPP(PPP_Graphics3D_Proxy::GetInfo()); | 176 AddPPP(PPP_Graphics3D_Proxy::GetInfo()); |
| 175 AddPPP(PPP_InputEvent_Proxy::GetInfo()); | 177 AddPPP(PPP_InputEvent_Proxy::GetInfo()); |
| 176 AddPPP(PPP_Instance_Private_Proxy::GetInfo()); | 178 AddPPP(PPP_Instance_Private_Proxy::GetInfo()); |
| 177 AddPPP(PPP_Instance_Proxy::GetInfo1_0()); | 179 AddPPP(PPP_Instance_Proxy::GetInfo1_0()); |
| 178 AddPPP(PPP_Messaging_Proxy::GetInfo()); | 180 AddPPP(PPP_Messaging_Proxy::GetInfo()); |
| 181 AddPPP(PPP_VideoCapture_Proxy::GetInfo()); |
| 179 AddPPP(PPP_VideoDecoder_Proxy::GetInfo()); | 182 AddPPP(PPP_VideoDecoder_Proxy::GetInfo()); |
| 180 } | 183 } |
| 181 | 184 |
| 182 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) { | 185 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) { |
| 183 DCHECK(name_to_plugin_info_.find(info->name) == | 186 DCHECK(name_to_plugin_info_.find(info->name) == |
| 184 name_to_plugin_info_.end()); | 187 name_to_plugin_info_.end()); |
| 185 DCHECK(info->id >= INTERFACE_ID_NONE && info->id < INTERFACE_ID_COUNT); | 188 DCHECK(info->id >= INTERFACE_ID_NONE && info->id < INTERFACE_ID_COUNT); |
| 186 | 189 |
| 187 name_to_plugin_info_[info->name] = info; | 190 name_to_plugin_info_[info->name] = info; |
| 188 } | 191 } |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 return delegate()->GetIPCMessageLoop(); | 277 return delegate()->GetIPCMessageLoop(); |
| 275 } | 278 } |
| 276 | 279 |
| 277 void Dispatcher::AddIOThreadMessageFilter( | 280 void Dispatcher::AddIOThreadMessageFilter( |
| 278 IPC::ChannelProxy::MessageFilter* filter) { | 281 IPC::ChannelProxy::MessageFilter* filter) { |
| 279 channel()->AddFilter(filter); | 282 channel()->AddFilter(filter); |
| 280 } | 283 } |
| 281 | 284 |
| 282 } // namespace proxy | 285 } // namespace proxy |
| 283 } // namespace pp | 286 } // namespace pp |
| OLD | NEW |