Use mojo for Chrome Loading, Part 1

content/browser/loader/resource_dispatcher_host_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This is the browser side of the resource dispatcher, it receives requests
 // from the child process (i.e. [Renderer, Plugin, Worker]ProcessHost), and
 // dispatches them to URLRequests. It then forwards the messages from the
 // URLRequests back to the correct process for handling.
 //
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
@@ skipping 15 matching lines @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "content/browser/download/download_resource_handler.h"
 #include "content/browser/download/save_types.h"
 #include "content/browser/loader/global_routing_id.h"
 #include "content/browser/loader/resource_loader.h"
 #include "content/browser/loader/resource_loader_delegate.h"
 #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"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/resource_type.h"
 #include "ipc/ipc_message.h"
 #include "net/base/request_priority.h"
@@ skipping 27 matching lines @@
 class ResourceMessageFilter;
 class ResourceRequestInfoImpl;
 class SaveFileManager;
 class ServiceWorkerNavigationHandleCore;
 class WebContentsImpl;
 struct CommonNavigationParams;
 struct DownloadSaveInfo;
 struct NavigationRequestInfo;
 struct Referrer;
 struct ResourceRequest;
+struct ResourceRequestCompletionStatus;
+struct ResourceResponseHead;
 
 // 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
 // methods (static or class) will be called from the UI thread and post to the
 // IO thread.
 // TODO(csharrison): Add methods tracking visibility and audio changes, to
 // propogate to the ResourceScheduler.
 class LoaderIOThreadNotifier : public WebContentsObserver {
  public:
@@ skipping 218 matching lines @@
   void BeginNavigationRequest(
       ResourceContext* resource_context,
       const NavigationRequestInfo& info,
       NavigationURLLoaderImplCore* loader,
       ServiceWorkerNavigationHandleCore* service_worker_handle_core);
 
   // Turns on stale-while-revalidate support, regardless of command-line flags
   // or experiment status. For unit tests only.
   void EnableStaleWhileRevalidateForTesting();
 
+  // These functions are used when loading with mojo.
+  // Stores a URLLoader and a URLLoaderClient in |this| object in order to use
+  // them in the next OnRequestResource call.
+  void SetMojoLoaderAndClientrForNextLoadRequest(

[kinuko, 2016/05/20 09:38:51]

nit: ...AndClientrFor -> ...AndClientFor ? (extra r)

[yhirano, 2016/05/20 11:32:54]

Done.

+      std::unique_ptr<mojom::URLLoader> loader,
+      mojom::URLLoaderClientPtr client);
+  // Sends |message| with mojo if it is possible and returns whether the message
+  // is sent.
+  bool SendWithMojoIfPossible(const IPC::Message& message,
+                              ResourceMessageFilter* filter);
+  // Add an uninitiated (i.e., resource loading is not yet started) loader in
+  // order to keep it alive.
+  void AddUninitiatedURLLoader(int child_id,
+                               std::unique_ptr<mojom::URLLoader> loader);
+  // Returns an uninitiated URL loader whose raw pointer equals to |loader|.
+  std::unique_ptr<mojom::URLLoader> TakeUninitiatedURLLoader(
+      mojom::URLLoader* loader);

[kinuko, 2016/05/20 09:38:51]

ditto, these are mojo-only impl details, is it possible to factor out some of
these into another class?  Esp. I'm feeling a bit uncomfortable having
for_next_load & uninitiated_loaders bits directly in this class.

[yhirano, 2016/05/20 11:32:54]

Done, but I'm not sure whether the code is getting easier to read.

+
  private:
   friend class LoaderIOThreadNotifier;
   friend class ResourceDispatcherHostTest;
 
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            TestBlockedRequestsProcessDies);
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            CalculateApproximateMemoryCost);
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            DetachableResourceTimesOut);
@@ skipping 33 matching lines @@
 
   // An init helper that runs on the IO thread.
   void OnInit();
 
   // A shutdown helper that runs on the IO thread.
   void OnShutdown();
 
   void OnRenderFrameDeleted(const GlobalFrameRoutingId& global_routing_id);
 
   // Helper function for regular and download requests.
-  void BeginRequestInternal(std::unique_ptr<net::URLRequest> request,
-                            std::unique_ptr<ResourceHandler> handler);
+  void BeginRequestInternal(
+      std::unique_ptr<net::URLRequest> request,
+      std::unique_ptr<ResourceHandler> handler,
+      std::unique_ptr<mojom::URLLoader> url_loader = nullptr,
+      mojom::URLLoaderClientPtr client = nullptr);
 
   void StartLoading(ResourceRequestInfoImpl* info,
                     std::unique_ptr<ResourceLoader> loader);
 
   // We keep track of how much memory each request needs and how many requests
   // are issued by each renderer. These are known as OustandingRequestStats.
   // Memory limits apply to all requests sent to us by the renderers. There is a
   // limit for each renderer. File descriptor limits apply to requests that are
   // receiving their body. These are known as in-flight requests. There is a
   // global limit that applies for the browser process. Each render is allowed
@@ skipping 90 matching lines @@
   // transferred from one process to another.
   void UpdateRequestForTransfer(int child_id,
                                 int route_id,
                                 int request_id,
                                 const ResourceRequest& request_data,
                                 LoaderMap::iterator iter);
 
   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 = nullptr,
+                    mojom::URLLoaderClientPtr client = nullptr);
 
   // Creates a ResourceHandler to be used by BeginRequest() for normal resource
   // loading.
   std::unique_ptr<ResourceHandler> CreateResourceHandler(
       net::URLRequest* request,
       const ResourceRequest& request_data,
       IPC::Message* sync_result,
       int route_id,
       int process_type,
       int child_id,
-      ResourceContext* resource_context);
+      ResourceContext* resource_context,
+      bool using_mojo);
 
   // Wraps |handler| in the standard resource handlers for normal resource
   // loading and navigation requests. This adds MimeTypeResourceHandler and
   // ResourceThrottles.
   std::unique_ptr<ResourceHandler> AddStandardHandlers(
       net::URLRequest* request,
       ResourceType resource_type,
       ResourceContext* resource_context,
       AppCacheService* appcache_service,
       int child_id,
       int route_id,
       std::unique_ptr<ResourceHandler> handler);
 
   void OnDataDownloadedACK(int request_id);
   void OnCancelRequest(int request_id);
   void OnReleaseDownloadedFile(int request_id);
   void OnDidChangePriority(int request_id,
                            net::RequestPriority new_priority,
                            int intra_priority_value);
 
+  // These function are used to trap messages about to sent to the renderer

[kinuko, 2016/05/20 09:38:51]

nit: function -> functions

[yhirano, 2016/05/20 11:32:54]

Deleted

+  // and send them via mojo.
+  void OnReceivedResponseForMojo(int request_id,
+                                 const ResourceResponseHead& head);
+  void OnRequestCompleteForMojo(int request_id,
+                                const ResourceRequestCompletionStatus& status);
+
   // Creates ResourceRequestInfoImpl for a download or page save.
   // |download| should be true if the request is a file download.
   ResourceRequestInfoImpl* CreateRequestInfo(
       int child_id,
       int render_view_route_id,
       int render_frame_route_id,
       bool download,
       ResourceContext* context);
 
   // Relationship of resource being authenticated with the top level page.
@@ skipping 128 matching lines @@
   typedef std::map<GlobalRequestID,
                    base::ObserverList<ResourceMessageDelegate>*> DelegateMap;
   DelegateMap delegate_map_;
 
   std::unique_ptr<ResourceScheduler> scheduler_;
 
   // Allows tests to use a mock CertStore. If set, the CertStore must
   // outlive this ResourceDispatcherHostImpl.
   CertStore* cert_store_for_testing_;
 
+  std::unique_ptr<mojom::URLLoader> mojo_loader_for_next_load_request_;
+  mojom::URLLoaderClientPtr mojo_loader_client_for_next_load_request_;
+  std::map<mojom::URLLoader*, std::pair<int, std::unique_ptr<mojom::URLLoader>>>
+      uninitiated_url_loaders_;
+
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcherHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_DISPATCHER_HOST_IMPL_H_