| Index: content/renderer/pepper/url_response_info_util.cc
|
| diff --git a/content/renderer/pepper/url_response_info_util.cc b/content/renderer/pepper/url_response_info_util.cc
|
| index a9eccefcecefb0a1cb6286d1f07bd43ad507963e..cf56b9377642972ea2c7fd043ad8b28a606cbc8b 100644
|
| --- a/content/renderer/pepper/url_response_info_util.cc
|
| +++ b/content/renderer/pepper/url_response_info_util.cc
|
| @@ -7,7 +7,10 @@
|
| #include "base/bind.h"
|
| #include "base/files/file_path.h"
|
| #include "base/message_loop/message_loop.h"
|
| -#include "content/renderer/pepper/ppb_file_ref_impl.h"
|
| +#include "content/public/renderer/renderer_ppapi_host.h"
|
| +#include "content/renderer/pepper/renderer_ppapi_host_impl.h"
|
| +#include "ipc/ipc_message.h"
|
| +#include "ppapi/proxy/ppapi_messages.h"
|
| #include "ppapi/shared_impl/url_response_info_data.h"
|
| #include "third_party/WebKit/public/platform/WebCString.h"
|
| #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
|
| @@ -43,13 +46,22 @@ bool IsRedirect(int32_t status) {
|
| return status >= 300 && status <= 399;
|
| }
|
|
|
| +void DidCreateResourceHost(ppapi::URLResponseInfoData data,
|
| + const base::FilePath& external_path,
|
| + const DataFromWebURLResponseCallback& callback,
|
| + int pending_resource_id) {
|
| + data.body_as_file_ref = ppapi::MakeExternalFileRefCreateInfo(
|
| + external_path, std::string(), pending_resource_id);
|
| + base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, data));
|
| +}
|
| +
|
| } // namespace
|
|
|
| -void DataFromWebURLResponse(PP_Instance pp_instance,
|
| +void DataFromWebURLResponse(RendererPpapiHostImpl* host_impl,
|
| + PP_Instance pp_instance,
|
| const WebURLResponse& response,
|
| const DataFromWebURLResponseCallback& callback) {
|
| ppapi::URLResponseInfoData data;
|
| -
|
| data.url = response.url().spec();
|
| data.status_code = response.httpStatusCode();
|
| data.status_text = response.httpStatusText().utf8();
|
| @@ -64,18 +76,16 @@ void DataFromWebURLResponse(PP_Instance pp_instance,
|
|
|
| WebString file_path = response.downloadFilePath();
|
| if (!file_path.isEmpty()) {
|
| - scoped_refptr<PPB_FileRef_Impl> file_ref(
|
| - PPB_FileRef_Impl::CreateExternal(
|
| - pp_instance,
|
| - base::FilePath::FromUTF16Unsafe(file_path),
|
| - std::string()));
|
| - data.body_as_file_ref = file_ref->GetCreateInfo();
|
| - file_ref->GetReference(); // The returned data has one ref for the plugin.
|
| + base::FilePath external_path = base::FilePath::FromUTF16Unsafe(file_path);
|
| + host_impl->CreateBrowserResourceHost(
|
| + pp_instance,
|
| + PpapiHostMsg_FileRef_CreateExternal(external_path),
|
| + base::Bind(&DidCreateResourceHost, data, external_path, callback));
|
| + } else {
|
| + base::MessageLoop::current()->PostTask(
|
| + FROM_HERE,
|
| + base::Bind(callback, data));
|
| }
|
| -
|
| - // We post data to a callback instead of returning it here because the new
|
| - // implementation for FileRef is asynchronous when creating the resource.
|
| - base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, data));
|
| }
|
|
|
| } // namespace content
|
|
|