| Index: ppapi/proxy/ppb_url_loader_proxy.cc
|
| diff --git a/ppapi/proxy/ppb_url_loader_proxy.cc b/ppapi/proxy/ppb_url_loader_proxy.cc
|
| index fbcfc1780372bd2db62c8045a1a426acc9c3a5cb..94d8baf4fb86991b8c5d56b2d512ed118c94b6ac 100644
|
| --- a/ppapi/proxy/ppb_url_loader_proxy.cc
|
| +++ b/ppapi/proxy/ppb_url_loader_proxy.cc
|
| @@ -27,6 +27,7 @@
|
| #include "ppapi/shared_impl/tracked_callback.h"
|
| #include "ppapi/thunk/enter.h"
|
| #include "ppapi/thunk/ppb_url_loader_api.h"
|
| +#include "ppapi/thunk/ppb_url_request_info_api.h"
|
| #include "ppapi/thunk/resource_creation_api.h"
|
| #include "ppapi/thunk/thunk.h"
|
|
|
| @@ -92,6 +93,8 @@ class URLLoader : public Resource, public PPB_URLLoader_API {
|
| // PPB_URLLoader_API implementation.
|
| virtual int32_t Open(PP_Resource request_id,
|
| scoped_refptr<TrackedCallback> callback) OVERRIDE;
|
| + virtual int32_t Open(const URLRequestInfoData& data,
|
| + scoped_refptr<TrackedCallback> callback) OVERRIDE;
|
| virtual int32_t FollowRedirect(
|
| scoped_refptr<TrackedCallback> callback) OVERRIDE;
|
| virtual PP_Bool GetUploadProgress(int64_t* bytes_sent,
|
| @@ -189,14 +192,18 @@ int32_t URLLoader::Open(PP_Resource request_id,
|
| " PP_URLREQUESTPROPERTY_ALLOWCROSSORIGINREQUESTS.");
|
| return PP_ERROR_BADRESOURCE;
|
| }
|
| + return Open(enter.object()->GetData(), callback);
|
| +}
|
|
|
| +int32_t URLLoader::Open(const URLRequestInfoData& data,
|
| + scoped_refptr<TrackedCallback> callback) {
|
| if (TrackedCallback::IsPending(current_callback_))
|
| return PP_ERROR_INPROGRESS;
|
|
|
| current_callback_ = callback;
|
|
|
| GetDispatcher()->Send(new PpapiHostMsg_PPBURLLoader_Open(
|
| - API_ID_PPB_URL_LOADER, host_resource(), enter.object()->GetData()));
|
| + API_ID_PPB_URL_LOADER, host_resource(), data));
|
| return PP_OK_COMPLETIONPENDING;
|
| }
|
|
|
| @@ -453,18 +460,10 @@ void PPB_URLLoader_Proxy::OnMsgCreate(PP_Instance instance,
|
| }
|
|
|
| void PPB_URLLoader_Proxy::OnMsgOpen(const HostResource& loader,
|
| - const PPB_URLRequestInfo_Data& data) {
|
| + const URLRequestInfoData& data) {
|
| EnterHostFromHostResourceForceCallback<PPB_URLLoader_API> enter(
|
| loader, callback_factory_, &PPB_URLLoader_Proxy::OnCallback, loader);
|
| - thunk::EnterResourceCreation enter_creation(loader.instance());
|
| - if (enter.failed() || enter_creation.failed())
|
| - return;
|
| -
|
| - ScopedPPResource request_resource(
|
| - ScopedPPResource::PassRef(),
|
| - enter_creation.functions()->CreateURLRequestInfo(loader.instance(),
|
| - data));
|
| - enter.SetResult(enter.object()->Open(request_resource, enter.callback()));
|
| + enter.SetResult(enter.object()->Open(data, enter.callback()));
|
| // TODO(brettw) bug 73236 register for the status callbacks.
|
| }
|
|
|
|
|