Remove body copy in WorkerMainScriptLoader::Start()

This CL changes WorkerMainScriptLoader to have ResourceRequestHead
rather than ResourceRequest so that we can avoid body copy.
With this CL, we remove all ResourceRequest body copy.

This CL also changes the function parameter to const ref.

Bug: 787704
Change-Id: I0f57cfd89b2f804e0c6f8eb167798591f1e5f0c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2631399Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
Commit-Queue: Yoichi Osato <yoichio@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845085}

third_party/blink/renderer/platform/loader/fetch/resource_request.cc

@@ -160,26 +160,12 @@ ResourceRequest::ResourceRequest(const KURL& url) : ResourceRequestHead(url) {}
 ResourceRequest::ResourceRequest(const ResourceRequestHead& head)
     : ResourceRequestHead(head) {}
 
-ResourceRequest& ResourceRequest::operator=(const ResourceRequest& src) {
-  DCHECK(!body_.StreamBody().is_valid());
-  DCHECK(!src.body_.StreamBody().is_valid());
-  this->ResourceRequestHead::operator=(src);
-  body_.SetFormBody(src.body_.FormBody());
-  return *this;
-}
-
 ResourceRequest::ResourceRequest(ResourceRequest&&) = default;
 
 ResourceRequest& ResourceRequest::operator=(ResourceRequest&&) = default;
 
 ResourceRequest::~ResourceRequest() = default;
 
-void ResourceRequest::CopyFrom(const ResourceRequest& src) {
-  DCHECK(!body_.StreamBody().is_valid());
-  DCHECK(!src.body_.StreamBody().is_valid());
-  *this = src;
-}
-
 void ResourceRequest::CopyHeadFrom(const ResourceRequestHead& src) {
   this->ResourceRequestHead::operator=(src);
 }

third_party/blink/renderer/platform/loader/fetch/resource_request.h

@@ -676,13 +676,11 @@ class PLATFORM_EXPORT ResourceRequest final : public ResourceRequestHead {
 
   ResourceRequest(const ResourceRequest&) = delete;
   ResourceRequest(ResourceRequest&&);
+  ResourceRequest& operator=(const ResourceRequest&) = delete;
   ResourceRequest& operator=(ResourceRequest&&);
 
   ~ResourceRequest();
 
-  // TODO(yoichio): Use move semantics as much as possible.
-  // See crbug.com/787704.
-  void CopyFrom(const ResourceRequest&);
   void CopyHeadFrom(const ResourceRequestHead&);
 
   const scoped_refptr<EncodedFormData>& HttpBody() const;
@@ -691,8 +689,6 @@ class PLATFORM_EXPORT ResourceRequest final : public ResourceRequestHead {
   ResourceRequestBody& MutableBody() { return body_; }
 
  private:
-  ResourceRequest& operator=(const ResourceRequest&);
-
   ResourceRequestBody body_;
 };
 

third_party/blink/renderer/platform/loader/fetch/url_loader/worker_main_script_loader.cc

@@ -31,7 +31,7 @@ WorkerMainScriptLoader::WorkerMainScriptLoader() = default;
 WorkerMainScriptLoader::~WorkerMainScriptLoader() = default;
 
 void WorkerMainScriptLoader::Start(
-    FetchParameters& fetch_params,
+    const FetchParameters& fetch_params,
     std::unique_ptr<WorkerMainScriptLoadParameters>
         worker_main_script_load_params,
     FetchContext* fetch_context,
@@ -39,7 +39,7 @@ void WorkerMainScriptLoader::Start(
     WorkerMainScriptLoaderClient* client) {
   DCHECK(resource_load_observer);
   DCHECK(client);
-  initial_request_.CopyFrom(fetch_params.GetResourceRequest());
+  initial_request_ = fetch_params.GetResourceRequest();
   resource_loader_options_ = fetch_params.Options();
   initial_request_url_ = fetch_params.GetResourceRequest().Url();
   last_request_url_ = initial_request_url_;
@@ -53,8 +53,9 @@ void WorkerMainScriptLoader::Start(
   // TODO(crbug.com/929370): Support CSP check to post violation reports for
   // worker top-level scripts, if off-the-main-thread fetch is enabled.
 
+  ResourceRequest resource_request(initial_request_);
   resource_load_observer_->WillSendRequest(
-      initial_request_.InspectorId(), initial_request_,
+      initial_request_.InspectorId(), resource_request,
       /*redirect_response=*/ResourceResponse(), ResourceType::kScript,
       resource_loader_options_.initiator_info);
 
@@ -79,7 +80,7 @@ void WorkerMainScriptLoader::Start(
       std::move(response_head), PreviewsTypes::kPreviewsUnspecified);
 
   resource_load_observer_->DidReceiveResponse(
-      initial_request_.InspectorId(), initial_request_, resource_response_,
+      initial_request_.InspectorId(), resource_request, resource_response_,
       /*resource=*/nullptr,
       ResourceLoadObserver::ResponseSource::kNotFromMemoryCache);
 

third_party/blink/renderer/platform/loader/fetch/url_loader/worker_main_script_loader.h

@@ -47,7 +47,7 @@ class PLATFORM_EXPORT WorkerMainScriptLoader final
   ~WorkerMainScriptLoader() override;
 
   // Starts to load the main script.
-  void Start(FetchParameters& fetch_params,
+  void Start(const FetchParameters& fetch_params,
              std::unique_ptr<WorkerMainScriptLoadParameters>
                  worker_main_script_load_params,
              FetchContext* fetch_context,
@@ -98,7 +98,7 @@ class PLATFORM_EXPORT WorkerMainScriptLoader final
   Member<WorkerMainScriptLoaderClient> client_;
   Member<ResourceLoadObserver> resource_load_observer_;
 
-  ResourceRequest initial_request_;
+  ResourceRequestHead initial_request_;
   ResourceLoaderOptions resource_loader_options_{nullptr /* world */};
   KURL initial_request_url_;
   KURL last_request_url_;