Stop keeping request redirect body copies in Resource.

This CL changes Resource to have ResourceRequestHead instead of
ResourceRequest in redirect chain.
That's because we don't copy request body in Resource after
crrev.com/c/2059889.

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

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

@@ -173,7 +173,7 @@ void RawResource::DidAddClient(ResourceClient* c) {
   RevalidationStartForbiddenScope revalidation_start_forbidden_scope(this);
   RawResourceClient* client = static_cast<RawResourceClient*>(c);
   for (const auto& redirect : RedirectChain()) {
-    client->RedirectReceived(this, redirect.request_,
+    client->RedirectReceived(this, ResourceRequest(redirect.request_),
                              redirect.redirect_response_);
     if (!HasClient(c))
       return;

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

@@ -472,7 +472,7 @@ static bool CanUseResponse(const ResourceResponse& response,
   return CurrentAge(response, response_timestamp) <= max_life;
 }
 
-const ResourceRequest& Resource::LastResourceRequest() const {
+const ResourceRequestHead& Resource::LastResourceRequest() const {
   if (!redirect_chain_.size())
     return GetResourceRequest();
   return redirect_chain_.back().request_;
@@ -1067,8 +1067,7 @@ bool Resource::MustRevalidateDueToCacheHeaders(bool allow_stale) const {
          GetResourceRequest().CacheControlContainsNoStore();
 }
 
-static bool ShouldRevalidateStaleResponse(const ResourceRequest& request,
-                                          const ResourceResponse& response,
+static bool ShouldRevalidateStaleResponse(const ResourceResponse& response,
                                           base::Time response_timestamp) {
   base::TimeDelta staleness = response.CacheControlStaleWhileRevalidate();
   if (staleness.is_zero())
@@ -1082,15 +1081,14 @@ bool Resource::ShouldRevalidateStaleResponse() const {
   for (auto& redirect : redirect_chain_) {
     // Use |response_timestamp_| since we don't store the timestamp
     // of each redirect response.
-    if (blink::ShouldRevalidateStaleResponse(redirect.request_,
-                                             redirect.redirect_response_,
+    if (blink::ShouldRevalidateStaleResponse(redirect.redirect_response_,
                                              response_timestamp_)) {
       return true;
     }
   }
 
-  return blink::ShouldRevalidateStaleResponse(
-      GetResourceRequest(), GetResponse(), response_timestamp_);
+  return blink::ShouldRevalidateStaleResponse(GetResponse(),
+                                              response_timestamp_);
 }
 
 bool Resource::StaleRevalidationRequested() const {

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

@@ -179,7 +179,7 @@ class PLATFORM_EXPORT Resource : public GarbageCollected<Resource>,
   const ResourceRequest& GetResourceRequest() const {
     return resource_request_;
   }
-  const ResourceRequest& LastResourceRequest() const;
+  const ResourceRequestHead& LastResourceRequest() const;
   const ResourceResponse* LastResourceResponse() const;
 
   virtual void SetRevalidatingRequest(const ResourceRequest&);
@@ -466,13 +466,11 @@ class PLATFORM_EXPORT Resource : public GarbageCollected<Resource>,
     DISALLOW_NEW();
 
    public:
-    explicit RedirectPair(const ResourceRequest& request,
+    explicit RedirectPair(const ResourceRequestHead& request,
                           const ResourceResponse& redirect_response)
-        : redirect_response_(redirect_response) {
-      request_.CopyFrom(request);
-    }
+        : request_(request), redirect_response_(redirect_response) {}
 
-    ResourceRequest request_;
+    ResourceRequestHead request_;
     ResourceResponse redirect_response_;
   };
   const Vector<RedirectPair>& RedirectChain() const { return redirect_chain_; }

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

@@ -2030,10 +2030,11 @@ void ResourceFetcher::EmulateLoadStartedForInspector(
   ResourceLoaderOptions options = resource->Options();
   options.initiator_info.name = initiator_name;
   FetchParameters params(std::move(resource_request), options);
-  Context().CanRequest(resource->GetType(), resource->LastResourceRequest(),
-                       resource->LastResourceRequest().Url(), params.Options(),
+  ResourceRequest last_resource_request(resource->LastResourceRequest());
+  Context().CanRequest(resource->GetType(), last_resource_request,
+                       last_resource_request.Url(), params.Options(),
                        ReportingDisposition::kReport,
-                       resource->LastResourceRequest().GetRedirectStatus());
+                       last_resource_request.GetRedirectStatus());
   DidLoadResourceFromMemoryCache(resource->InspectorId(), resource,
                                  params.GetResourceRequest(),
                                  false /* is_static_data */);

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

@@ -804,18 +804,19 @@ bool ResourceLoader::WillFollowRedirect(
       redirect_response_with_type ? *redirect_response_with_type
                                   : redirect_response;
 
-  // The following two calls may rewrite the new_request.Url() to
+  // The following two calls may rewrite the new_request->Url() to
   // something else not for rejecting redirect but for other reasons.
   // E.g. WebFrameTestClient::WillSendRequest() and
   // RenderFrameImpl::WillSendRequest(). We should reflect the
-  // rewriting but currently we cannot. So, compare new_request.Url() and
+  // rewriting but currently we cannot. So, compare new_request->Url() and
   // new_url after calling them, and return false to make the redirect fail on
   // mismatch.
 
   WebScopedVirtualTimePauser unused_virtual_time_pauser;
+  // TODO(yoichio): Have PrepareRequest use ResourceRequestHead.
   Context().PrepareRequest(*new_request, resource_->Options().initiator_info,
-                           unused_virtual_time_pauser,
-                           resource_->GetType());
+                           unused_virtual_time_pauser, resource_->GetType());
+  DCHECK(!new_request->HttpBody());
   if (auto* observer = fetcher_->GetResourceLoadObserver()) {
     observer->WillSendRequest(resource_->InspectorId(), *new_request,
                               redirect_response_to_pass, resource_->GetType(),
@@ -957,8 +958,10 @@ void ResourceLoader::DidReceiveResponseInternal(
             kEnableCorsHandlingByResourceFetcher &&
         request_mode == network::mojom::RequestMode::kCors &&
         response.WasFallbackRequiredByServiceWorker()) {
+      DCHECK(resource_->RedirectChain().IsEmpty());
       ResourceRequest last_request;
-      last_request.CopyFrom(resource_->LastResourceRequest());
+      last_request.CopyHeadFrom(resource_->GetResourceRequest());
+      last_request.SetHttpBody(resource_->GetResourceRequest().HttpBody());
       DCHECK(!last_request.GetSkipServiceWorker());
       // This code handles the case when a controlling service worker doesn't
       // handle a cross origin request.

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

@@ -117,7 +117,7 @@ void ResourceRequest::CopyHeadFrom(const ResourceRequestHead& src) {
   this->ResourceRequestHead::operator=(src);
 }
 
-std::unique_ptr<ResourceRequest> ResourceRequest::CreateRedirectRequest(
+std::unique_ptr<ResourceRequest> ResourceRequestHead::CreateRedirectRequest(
     const KURL& new_url,
     const AtomicString& new_method,
     const net::SiteForCookies& new_site_for_cookies,

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

@@ -67,13 +67,24 @@ class PLATFORM_EXPORT ResourceRequestHead {
   ResourceRequestHead();
   explicit ResourceRequestHead(const KURL&);
 
-  explicit ResourceRequestHead(const ResourceRequestHead&);
+  ResourceRequestHead(const ResourceRequestHead&);
   ResourceRequestHead& operator=(const ResourceRequestHead&);
-  explicit ResourceRequestHead(ResourceRequestHead&&);
+  ResourceRequestHead(ResourceRequestHead&&);
   ResourceRequestHead& operator=(ResourceRequestHead&&);
 
   ~ResourceRequestHead();
 
+  // Constructs a new ResourceRequest for a redirect from this instance.
+  // Since body for a redirect request is kept and handled in the network
+  // service, the returned instance here in blink side doesn't contain body.
+  std::unique_ptr<ResourceRequest> CreateRedirectRequest(
+      const KURL& new_url,
+      const AtomicString& new_method,
+      const net::SiteForCookies& new_site_for_cookies,
+      const String& new_referrer,
+      network::mojom::ReferrerPolicy new_referrer_policy,
+      bool skip_service_worker) const;
+
   bool IsNull() const;
 
   const KURL& Url() const;
@@ -559,15 +570,6 @@ class PLATFORM_EXPORT ResourceRequest final : public ResourceRequestHead {
   void CopyFrom(const ResourceRequest&);
   void CopyHeadFrom(const ResourceRequestHead&);
 
-  // Constructs a new ResourceRequest for a redirect from this instance.
-  std::unique_ptr<ResourceRequest> CreateRedirectRequest(
-      const KURL& new_url,
-      const AtomicString& new_method,
-      const net::SiteForCookies& new_site_for_cookies,
-      const String& new_referrer,
-      network::mojom::ReferrerPolicy new_referrer_policy,
-      bool skip_service_worker) const;
-
   EncodedFormData* HttpBody() const;
   void SetHttpBody(scoped_refptr<EncodedFormData>);