summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/ppb_url_response_info_proxy.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-21 00:26:43 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-21 00:26:43 +0000
commit4614f1974881ecfd0a0118683bac628c6128c2a9 (patch)
treec69836459560dd8003f7e18ca554f2e1d7f79b4d /ppapi/proxy/ppb_url_response_info_proxy.h
parentb8e6654fb91108033580f510e2d411093936fc2f (diff)
downloadchromium_src-4614f1974881ecfd0a0118683bac628c6128c2a9.zip
chromium_src-4614f1974881ecfd0a0118683bac628c6128c2a9.tar.gz
chromium_src-4614f1974881ecfd0a0118683bac628c6128c2a9.tar.bz2
First pass at making the proxy handle multiple renderers. This associates the
instance with resources and has most callers retrieve the dispatcher according to the appropriate instance. This isn't hooked up to anything yet. This changes some PPB_Flash interface methods to use PP_Bool. The most challenging part of the change is in the plugin_var_tracker which now needs to track which dispatcher each var object came from, and remap var IDs since each renderer will be generating var IDs in its own space, which will likely overlap. A similar system will need to be done for resources which is not implemented yet. I added some null checks in audio_impl because audio_ can be NULL in some cases when using the trusted API. I discovered this when testing NaCl for this patch. Review URL: http://codereview.chromium.org/6282007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72053 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_url_response_info_proxy.h')
-rw-r--r--ppapi/proxy/ppb_url_response_info_proxy.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/ppapi/proxy/ppb_url_response_info_proxy.h b/ppapi/proxy/ppb_url_response_info_proxy.h
index c1de259..079f3b7 100644
--- a/ppapi/proxy/ppb_url_response_info_proxy.h
+++ b/ppapi/proxy/ppb_url_response_info_proxy.h
@@ -6,6 +6,7 @@
#define PPAPI_PROXY_PPB_URL_RESPONSE_INFO_PROXY_H_
#include "base/basictypes.h"
+#include "ppapi/c/pp_instance.h"
#include "ppapi/c/pp_module.h"
#include "ppapi/c/pp_resource.h"
#include "ppapi/proxy/interface_proxy.h"
@@ -26,7 +27,8 @@ class PPB_URLResponseInfo_Proxy : public InterfaceProxy {
// URLResponseInfo objects are actually returned by the URLLoader class.
// This function allows the URLLoader proxy to start the tracking of
// a response info object in the plugin.
- static void TrackPluginResource(PP_Resource response_resource);
+ static void TrackPluginResource(PP_Instance instance,
+ PP_Resource response_resource);
const PPB_URLResponseInfo* ppb_url_response_info_target() const {
return static_cast<const PPB_URLResponseInfo*>(target_interface());