| Index: content/child/web_url_loader_impl.cc
|
| diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc
|
| index cf47c4fedca531c858a37319a37e9ef28da01743..efe1978442c7bb3cf239301ebd50d77b443c929c 100644
|
| --- a/content/child/web_url_loader_impl.cc
|
| +++ b/content/child/web_url_loader_impl.cc
|
| @@ -35,6 +35,7 @@
|
| #include "content/common/resource_request_body.h"
|
| #include "content/common/service_worker/service_worker_types.h"
|
| #include "content/common/ssl_status_serialization.h"
|
| +#include "content/common/url_loader.mojom.h"
|
| #include "content/public/child/fixed_received_data.h"
|
| #include "content/public/child/request_peer.h"
|
| #include "content/public/common/browser_side_navigation_policy.h"
|
| @@ -278,7 +279,8 @@ class WebURLLoaderImpl::Context : public base::RefCounted<Context> {
|
|
|
| Context(WebURLLoaderImpl* loader,
|
| ResourceDispatcher* resource_dispatcher,
|
| - std::unique_ptr<blink::WebTaskRunner> task_runner);
|
| + std::unique_ptr<blink::WebTaskRunner> task_runner,
|
| + mojom::URLLoaderFactory* factory);
|
|
|
| WebURLLoaderClient* client() const { return client_; }
|
| void set_client(WebURLLoaderClient* client) { client_ = client; }
|
| @@ -340,6 +342,8 @@ class WebURLLoaderImpl::Context : public base::RefCounted<Context> {
|
| enum DeferState {NOT_DEFERRING, SHOULD_DEFER, DEFERRED_DATA};
|
| DeferState defers_loading_;
|
| int request_id_;
|
| +
|
| + mojom::URLLoaderFactory* url_loader_factory_;
|
| };
|
|
|
| // A thin wrapper class for Context to ensure its lifetime while it is
|
| @@ -374,14 +378,16 @@ class WebURLLoaderImpl::RequestPeerImpl : public RequestPeer {
|
| WebURLLoaderImpl::Context::Context(
|
| WebURLLoaderImpl* loader,
|
| ResourceDispatcher* resource_dispatcher,
|
| - std::unique_ptr<blink::WebTaskRunner> web_task_runner)
|
| + std::unique_ptr<blink::WebTaskRunner> web_task_runner,
|
| + mojom::URLLoaderFactory* url_loader_factory)
|
| : loader_(loader),
|
| client_(NULL),
|
| resource_dispatcher_(resource_dispatcher),
|
| web_task_runner_(std::move(web_task_runner)),
|
| referrer_policy_(blink::WebReferrerPolicyDefault),
|
| defers_loading_(NOT_DEFERRING),
|
| - request_id_(-1) {}
|
| + request_id_(-1),
|
| + url_loader_factory_(url_loader_factory) {}
|
|
|
| void WebURLLoaderImpl::Context::Cancel() {
|
| TRACE_EVENT_WITH_FLOW0("loading", "WebURLLoaderImpl::Context::Cancel", this,
|
| @@ -534,10 +540,14 @@ void WebURLLoaderImpl::Context::Start(const WebURLRequest& request,
|
| request_info.resource_body_stream_url = stream_override_->stream_url;
|
| }
|
|
|
| + mojom::URLLoaderPtr loader = nullptr;
|
| + if (request.getLoadingIPCType() == blink::WebURLRequest::LoadingIPCType::Mojo)
|
| + url_loader_factory_->CreateURLLoader(GetProxy(&loader));
|
| +
|
| if (sync_load_response) {
|
| DCHECK(defers_loading_ == NOT_DEFERRING);
|
| - resource_dispatcher_->StartSync(
|
| - request_info, request_body.get(), sync_load_response);
|
| + resource_dispatcher_->StartSync(request_info, request_body.get(),
|
| + sync_load_response, std::move(loader));
|
| return;
|
| }
|
|
|
| @@ -545,7 +555,8 @@ void WebURLLoaderImpl::Context::Start(const WebURLRequest& request,
|
| TRACE_EVENT_FLAG_FLOW_OUT);
|
| request_id_ = resource_dispatcher_->StartAsync(
|
| request_info, request_body.get(),
|
| - base::WrapUnique(new WebURLLoaderImpl::RequestPeerImpl(this)));
|
| + base::WrapUnique(new WebURLLoaderImpl::RequestPeerImpl(this)),
|
| + std::move(loader));
|
|
|
| if (defers_loading_ != NOT_DEFERRING)
|
| resource_dispatcher_->SetDefersLoading(request_id_, true);
|
| @@ -915,9 +926,12 @@ void WebURLLoaderImpl::RequestPeerImpl::OnCompletedRequest(
|
|
|
| WebURLLoaderImpl::WebURLLoaderImpl(
|
| ResourceDispatcher* resource_dispatcher,
|
| - std::unique_ptr<blink::WebTaskRunner> web_task_runner)
|
| - : context_(
|
| - new Context(this, resource_dispatcher, std::move(web_task_runner))) {}
|
| + std::unique_ptr<blink::WebTaskRunner> web_task_runner,
|
| + mojom::URLLoaderFactory* url_loader_factory)
|
| + : context_(new Context(this,
|
| + resource_dispatcher,
|
| + std::move(web_task_runner),
|
| + url_loader_factory)) {}
|
|
|
| WebURLLoaderImpl::~WebURLLoaderImpl() {
|
| cancel();
|
|
|