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

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

Issue 6995083: Proxy PPB_Var, fix o-o-p string var id tracking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated copyright header Created 9 years, 6 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/ppapi_tests.gypi ('k') | ppapi/proxy/plugin_var_serialization_rules.cc » ('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/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 16 matching lines...) Expand all
27 #include "ppapi/c/pp_errors.h" 27 #include "ppapi/c/pp_errors.h"
28 #include "ppapi/c/ppb_audio.h" 28 #include "ppapi/c/ppb_audio.h"
29 #include "ppapi/c/ppb_audio_config.h" 29 #include "ppapi/c/ppb_audio_config.h"
30 #include "ppapi/c/ppb_core.h" 30 #include "ppapi/c/ppb_core.h"
31 #include "ppapi/c/ppb_graphics_2d.h" 31 #include "ppapi/c/ppb_graphics_2d.h"
32 #include "ppapi/c/ppb_image_data.h" 32 #include "ppapi/c/ppb_image_data.h"
33 #include "ppapi/c/ppb_instance.h" 33 #include "ppapi/c/ppb_instance.h"
34 #include "ppapi/c/ppb_url_loader.h" 34 #include "ppapi/c/ppb_url_loader.h"
35 #include "ppapi/c/ppb_url_request_info.h" 35 #include "ppapi/c/ppb_url_request_info.h"
36 #include "ppapi/c/ppb_url_response_info.h" 36 #include "ppapi/c/ppb_url_response_info.h"
37 #include "ppapi/c/ppb_var.h"
37 #include "ppapi/c/ppp_instance.h" 38 #include "ppapi/c/ppp_instance.h"
38 #include "ppapi/c/private/ppb_flash.h" 39 #include "ppapi/c/private/ppb_flash.h"
39 #include "ppapi/c/private/ppb_flash_clipboard.h" 40 #include "ppapi/c/private/ppb_flash_clipboard.h"
40 #include "ppapi/c/private/ppb_flash_file.h" 41 #include "ppapi/c/private/ppb_flash_file.h"
41 #include "ppapi/c/private/ppb_flash_menu.h" 42 #include "ppapi/c/private/ppb_flash_menu.h"
42 #include "ppapi/c/private/ppb_flash_net_connector.h" 43 #include "ppapi/c/private/ppb_flash_net_connector.h"
43 #include "ppapi/c/private/ppb_pdf.h" 44 #include "ppapi/c/private/ppb_pdf.h"
44 #include "ppapi/c/trusted/ppb_url_loader_trusted.h" 45 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
45 #include "ppapi/proxy/ppapi_messages.h" 46 #include "ppapi/proxy/ppapi_messages.h"
46 #include "ppapi/proxy/ppb_audio_config_proxy.h" 47 #include "ppapi/proxy/ppb_audio_config_proxy.h"
(...skipping 23 matching lines...) Expand all
70 #include "ppapi/proxy/ppb_instance_proxy.h" 71 #include "ppapi/proxy/ppb_instance_proxy.h"
71 #include "ppapi/proxy/ppb_opengles2_proxy.h" 72 #include "ppapi/proxy/ppb_opengles2_proxy.h"
72 #include "ppapi/proxy/ppb_pdf_proxy.h" 73 #include "ppapi/proxy/ppb_pdf_proxy.h"
73 #include "ppapi/proxy/ppb_surface_3d_proxy.h" 74 #include "ppapi/proxy/ppb_surface_3d_proxy.h"
74 #include "ppapi/proxy/ppb_testing_proxy.h" 75 #include "ppapi/proxy/ppb_testing_proxy.h"
75 #include "ppapi/proxy/ppb_url_loader_proxy.h" 76 #include "ppapi/proxy/ppb_url_loader_proxy.h"
76 #include "ppapi/proxy/ppb_url_request_info_proxy.h" 77 #include "ppapi/proxy/ppb_url_request_info_proxy.h"
77 #include "ppapi/proxy/ppb_url_response_info_proxy.h" 78 #include "ppapi/proxy/ppb_url_response_info_proxy.h"
78 #include "ppapi/proxy/ppb_url_util_proxy.h" 79 #include "ppapi/proxy/ppb_url_util_proxy.h"
79 #include "ppapi/proxy/ppb_var_deprecated_proxy.h" 80 #include "ppapi/proxy/ppb_var_deprecated_proxy.h"
81 #include "ppapi/proxy/ppb_var_proxy.h"
80 #include "ppapi/proxy/ppp_class_proxy.h" 82 #include "ppapi/proxy/ppp_class_proxy.h"
81 #include "ppapi/proxy/ppp_graphics_3d_proxy.h" 83 #include "ppapi/proxy/ppp_graphics_3d_proxy.h"
82 #include "ppapi/proxy/ppp_instance_private_proxy.h" 84 #include "ppapi/proxy/ppp_instance_private_proxy.h"
83 #include "ppapi/proxy/ppp_instance_proxy.h" 85 #include "ppapi/proxy/ppp_instance_proxy.h"
84 #include "ppapi/proxy/var_serialization_rules.h" 86 #include "ppapi/proxy/var_serialization_rules.h"
85 87
86 namespace pp { 88 namespace pp {
87 namespace proxy { 89 namespace proxy {
88 90
89 namespace { 91 namespace {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 AddPPB(PPB_OpenGLES2_Proxy::GetInfo()); 139 AddPPB(PPB_OpenGLES2_Proxy::GetInfo());
138 AddPPB(PPB_PDF_Proxy::GetInfo()); 140 AddPPB(PPB_PDF_Proxy::GetInfo());
139 AddPPB(PPB_Surface3D_Proxy::GetInfo()); 141 AddPPB(PPB_Surface3D_Proxy::GetInfo());
140 AddPPB(PPB_Testing_Proxy::GetInfo()); 142 AddPPB(PPB_Testing_Proxy::GetInfo());
141 AddPPB(PPB_URLLoader_Proxy::GetInfo()); 143 AddPPB(PPB_URLLoader_Proxy::GetInfo());
142 AddPPB(PPB_URLLoaderTrusted_Proxy::GetInfo()); 144 AddPPB(PPB_URLLoaderTrusted_Proxy::GetInfo());
143 AddPPB(PPB_URLRequestInfo_Proxy::GetInfo()); 145 AddPPB(PPB_URLRequestInfo_Proxy::GetInfo());
144 AddPPB(PPB_URLResponseInfo_Proxy::GetInfo()); 146 AddPPB(PPB_URLResponseInfo_Proxy::GetInfo());
145 AddPPB(PPB_URLUtil_Proxy::GetInfo()); 147 AddPPB(PPB_URLUtil_Proxy::GetInfo());
146 AddPPB(PPB_Var_Deprecated_Proxy::GetInfo()); 148 AddPPB(PPB_Var_Deprecated_Proxy::GetInfo());
149 AddPPB(PPB_Var_Proxy::GetInfo());
147 150
148 #ifdef ENABLE_FLAPPER_HACKS 151 #ifdef ENABLE_FLAPPER_HACKS
149 AddPPB(PPB_Flash_NetConnector_Proxy::GetInfo()); 152 AddPPB(PPB_Flash_NetConnector_Proxy::GetInfo());
150 #endif 153 #endif
151 154
152 // PPP (plugin) interfaces. 155 // PPP (plugin) interfaces.
153 AddPPP(PPP_Graphics3D_Proxy::GetInfo()); 156 AddPPP(PPP_Graphics3D_Proxy::GetInfo());
154 AddPPP(PPP_Instance_Private_Proxy::GetInfo()); 157 AddPPP(PPP_Instance_Private_Proxy::GetInfo());
155 AddPPP(PPP_Instance_Proxy::GetInfo()); 158 AddPPP(PPP_Instance_Proxy::GetInfo());
156 } 159 }
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 return delegate()->GetIPCMessageLoop(); 261 return delegate()->GetIPCMessageLoop();
259 } 262 }
260 263
261 void Dispatcher::AddIOThreadMessageFilter( 264 void Dispatcher::AddIOThreadMessageFilter(
262 IPC::ChannelProxy::MessageFilter* filter) { 265 IPC::ChannelProxy::MessageFilter* filter) {
263 channel()->AddFilter(filter); 266 channel()->AddFilter(filter);
264 } 267 }
265 268
266 } // namespace proxy 269 } // namespace proxy
267 } // namespace pp 270 } // namespace pp
OLDNEW
« no previous file with comments | « ppapi/ppapi_tests.gypi ('k') | ppapi/proxy/plugin_var_serialization_rules.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698