| Index: content/browser/loader/resource_dispatcher_host_impl.h
|
| diff --git a/content/browser/loader/resource_dispatcher_host_impl.h b/content/browser/loader/resource_dispatcher_host_impl.h
|
| index 648822822bc627cc3549f69ebe7d5a8a7d724206..d5f4b664c6b4ebede8c56531daa329b58698c91a 100644
|
| --- a/content/browser/loader/resource_dispatcher_host_impl.h
|
| +++ b/content/browser/loader/resource_dispatcher_host_impl.h
|
| @@ -33,6 +33,7 @@
|
| #include "content/browser/loader/resource_scheduler.h"
|
| #include "content/common/content_export.h"
|
| #include "content/common/resource_request_body.h"
|
| +#include "content/common/url_loader.mojom.h"
|
| #include "content/public/browser/child_process_data.h"
|
| #include "content/public/browser/download_item.h"
|
| #include "content/public/browser/download_url_parameters.h"
|
| @@ -42,6 +43,7 @@
|
| #include "content/public/browser/web_contents_observer.h"
|
| #include "content/public/common/resource_type.h"
|
| #include "ipc/ipc_message.h"
|
| +#include "mojo/public/cpp/system/data_pipe.h"
|
| #include "net/base/request_priority.h"
|
| #include "net/cookies/canonical_cookie.h"
|
| #include "net/url_request/url_request.h"
|
| @@ -81,6 +83,10 @@ struct NavigationRequestInfo;
|
| struct Referrer;
|
| struct ResourceRequest;
|
|
|
| +namespace mojom {
|
| +class URLLoader;
|
| +} // namespace mojom
|
| +
|
| // This class is responsible for notifying the IO thread (specifically, the
|
| // ResourceDispatcherHostImpl) of frame events. It has an interace for callers
|
| // to use and also sends notifications on WebContentsObserver events. All
|
| @@ -318,9 +324,27 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
|
| // or experiment status. For unit tests only.
|
| void EnableStaleWhileRevalidateForTesting();
|
|
|
| + // These functions are used when loading with mojo.
|
| + // Called when loading a request with mojo.
|
| + void OnRequestResourceWithMojo(int routing_id,
|
| + int request_id,
|
| + const ResourceRequest& request,
|
| + std::unique_ptr<mojom::URLLoader> url_loader,
|
| + mojom::URLLoaderClientPtr url_loader_client,
|
| + ResourceMessageFilter* filter);
|
| +
|
| + // Add an unstarted (i.e., resource loading is not yet started) loader in
|
| + // order to keep it alive.
|
| + void AddUnstartedURLLoader(int child_id,
|
| + std::unique_ptr<mojom::URLLoader> loader);
|
| + // Returns an unstarted URL loader whose raw pointer equals to |loader|.
|
| + std::unique_ptr<mojom::URLLoader> TakeUnstartedURLLoader(
|
| + mojom::URLLoader* loader);
|
| +
|
| private:
|
| friend class LoaderIOThreadNotifier;
|
| friend class ResourceDispatcherHostTest;
|
| + class MojoHelper;
|
|
|
| FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
|
| TestBlockedRequestsProcessDies);
|
| @@ -466,6 +490,13 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
|
| void OnRequestResource(int routing_id,
|
| int request_id,
|
| const ResourceRequest& request_data);
|
| +
|
| + void OnRequestResourceInternal(int routing_id,
|
| + int request_id,
|
| + const ResourceRequest& request_data,
|
| + std::unique_ptr<mojom::URLLoader> url_loader,
|
| + mojom::URLLoaderClientPtr url_loader_client);
|
| +
|
| void OnSyncLoad(int request_id,
|
| const ResourceRequest& request_data,
|
| IPC::Message* sync_result);
|
| @@ -483,7 +514,9 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
|
| void BeginRequest(int request_id,
|
| const ResourceRequest& request_data,
|
| IPC::Message* sync_result, // only valid for sync
|
| - int route_id); // only valid for async
|
| + int route_id, // only valid for async
|
| + std::unique_ptr<mojom::URLLoader> url_loader,
|
| + mojom::URLLoaderClientPtr url_loader_client);
|
|
|
| // Creates a ResourceHandler to be used by BeginRequest() for normal resource
|
| // loading.
|
| @@ -494,7 +527,9 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
|
| int route_id,
|
| int process_type,
|
| int child_id,
|
| - ResourceContext* resource_context);
|
| + ResourceContext* resource_context,
|
| + std::unique_ptr<mojom::URLLoader> url_loader,
|
| + mojom::URLLoaderClientPtr url_loader_client);
|
|
|
| // Wraps |handler| in the standard resource handlers for normal resource
|
| // loading and navigation requests. This adds MimeTypeResourceHandler and
|
| @@ -663,6 +698,11 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
|
| // outlive this ResourceDispatcherHostImpl.
|
| CertStore* cert_store_for_testing_;
|
|
|
| + // |unstarted_url_loader_| is a set of mojom::URLLoaders that are not yet
|
| + // started.
|
| + std::map<mojom::URLLoader*, std::pair<int, std::unique_ptr<mojom::URLLoader>>>
|
| + unstarted_url_loaders_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ResourceDispatcherHostImpl);
|
| };
|
|
|
|
|