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

Unified Diff: ppapi/proxy/ppb_url_loader_proxy.h

Issue 8226009: Remove the proxy callback tracker. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: ppapi/proxy/ppb_url_loader_proxy.h
diff --git a/ppapi/proxy/ppb_url_loader_proxy.h b/ppapi/proxy/ppb_url_loader_proxy.h
index defae9ba6552b873df1a6e6328e96d9baebc35dd..772b6877da5415a1a2d7d7aece942c621873078d 100644
--- a/ppapi/proxy/ppb_url_loader_proxy.h
+++ b/ppapi/proxy/ppb_url_loader_proxy.h
@@ -41,7 +41,7 @@ class PPB_URLLoader_Proxy : public InterfaceProxy {
// function allows the proxy for DocumentLoad to create the correct plugin
// proxied info for the given browser-supplied URLLoader resource ID.
static PP_Resource TrackPluginResource(
- const ppapi::HostResource& url_loader_resource);
+ const HostResource& url_loader_resource);
// InterfaceProxy implementation.
virtual bool OnMessageReceived(const IPC::Message& msg);
@@ -60,32 +60,33 @@ class PPB_URLLoader_Proxy : public InterfaceProxy {
// Plugin->renderer message handlers.
void OnMsgCreate(PP_Instance instance,
- ppapi::HostResource* result);
- void OnMsgOpen(const ppapi::HostResource& loader,
- const PPB_URLRequestInfo_Data& data,
- uint32_t serialized_callback);
- void OnMsgFollowRedirect(const ppapi::HostResource& loader,
- uint32_t serialized_callback);
- void OnMsgGetResponseInfo(const ppapi::HostResource& loader,
- ppapi::HostResource* result);
- void OnMsgReadResponseBody(const ppapi::HostResource& loader,
+ HostResource* result);
+ void OnMsgOpen(const HostResource& loader,
+ const PPB_URLRequestInfo_Data& data);
+ void OnMsgFollowRedirect(const HostResource& loader);
+ void OnMsgGetResponseInfo(const HostResource& loader,
+ HostResource* result);
+ void OnMsgReadResponseBody(const HostResource& loader,
int32_t bytes_to_read);
- void OnMsgFinishStreamingToFile(const ppapi::HostResource& loader,
- uint32_t serialized_callback);
- void OnMsgClose(const ppapi::HostResource& loader);
- void OnMsgGrantUniversalAccess(const ppapi::HostResource& loader);
+ void OnMsgFinishStreamingToFile(const HostResource& loader);
+ void OnMsgClose(const HostResource& loader);
+ void OnMsgGrantUniversalAccess(const HostResource& loader);
// Renderer->plugin message handlers.
void OnMsgUpdateProgress(
const PPBURLLoader_UpdateProgress_Params& params);
- void OnMsgReadResponseBodyAck(const ppapi::HostResource& pp_resource,
+ void OnMsgReadResponseBodyAck(const HostResource& host_resource,
int32_t result,
const std::string& data);
+ void OnMsgCallbackComplete(const HostResource& host_resource, int32_t result);
// Handles callbacks for read complete messages. Takes ownership of the info
// pointer.
void OnReadCallback(int32_t result, ReadCallbackInfo* info);
+ // Handles callback for everything but reads.
+ void OnCallback(int32_t result, const HostResource& resource);
+
pp::CompletionCallbackFactory<PPB_URLLoader_Proxy,
ProxyNonThreadSafeRefCount> callback_factory_;

Powered by Google App Engine
This is Rietveld 408576698