Introduce url_list to the Response scheme of CacheStorage.

third_party/WebKit/Source/modules/fetch/FetchResponseData.cpp

 // Copyright 2014 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.
 
 #include "modules/fetch/FetchResponseData.h"
 
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/fetch/FetchUtils.h"
 #include "modules/fetch/BodyStreamBuffer.h"
@@ skipping 63 matching lines @@
   return response;
 }
 
 FetchResponseData* FetchResponseData::createBasicFilteredResponse() const {
   DCHECK_EQ(m_type, DefaultType);
   // "A basic filtered response is a filtered response whose type is |basic|,
   // header list excludes any headers in internal response's header list whose
   // name is `Set-Cookie` or `Set-Cookie2`."
   FetchResponseData* response =
       new FetchResponseData(BasicType, m_status, m_statusMessage);
-  response->m_url = m_url;
+  response->setURLList(m_urlList);
   for (size_t i = 0; i < m_headerList->size(); ++i) {
     const FetchHeaderList::Header* header = m_headerList->list()[i].get();
     if (FetchUtils::isForbiddenResponseHeaderName(header->first))
       continue;
     response->m_headerList->append(header->first, header->second);
   }
   response->m_buffer = m_buffer;
   response->m_mimeType = m_mimeType;
   response->m_internalResponse = const_cast<FetchResponseData*>(this);
   return response;
@@ skipping 15 matching lines @@
   DCHECK_EQ(m_type, DefaultType);
   // "A CORS filtered response is a filtered response whose type is |CORS|,
   // header list excludes all headers in internal response's header list,
   // except those whose name is either one of `Cache-Control`,
   // `Content-Language`, `Content-Type`, `Expires`, `Last-Modified`, and
   // `Pragma`, and except those whose name is one of the values resulting from
   // parsing `Access-Control-Expose-Headers` in internal response's header
   // list."
   FetchResponseData* response =
       new FetchResponseData(CORSType, m_status, m_statusMessage);
-  response->m_url = m_url;
+  response->setURLList(m_urlList);
   for (size_t i = 0; i < m_headerList->size(); ++i) {
     const FetchHeaderList::Header* header = m_headerList->list()[i].get();
     const String& name = header->first;
     const bool explicitlyExposed = exposedHeaders.contains(name);
     if (isOnAccessControlResponseHeaderWhitelist(name) ||
         (explicitlyExposed &&
          !FetchUtils::isForbiddenResponseHeaderName(name))) {
       if (explicitlyExposed)
         response->m_corsExposedHeaderNames.add(name);
       response->m_headerList->append(name, header->second);
@@ skipping 21 matching lines @@
 FetchResponseData* FetchResponseData::createOpaqueRedirectFilteredResponse()
     const {
   DCHECK_EQ(m_type, DefaultType);
   // "An opaque filtered response is a filtered response whose type is
   // 'opaqueredirect', status is 0, status message is the empty byte sequence,
   // header list is the empty list, body is null, and cache state is 'none'."
   //
   // https://fetch.spec.whatwg.org/#concept-filtered-response-opaque-redirect
   FetchResponseData* response =
       new FetchResponseData(OpaqueRedirectType, 0, "");
-  response->m_url = m_url;
+  response->setURLList(m_urlList);
   response->m_internalResponse = const_cast<FetchResponseData*>(this);
   return response;
 }
 
+const KURL* FetchResponseData::url() const {
+  // "A response has an associated url. It is a pointer to the last response URL
+  // in response’s url list and null if response’s url list is the empty list."
+  if (m_urlList.isEmpty())
+    return nullptr;
+  return &m_urlList.back();
+}
+
 String FetchResponseData::mimeType() const {
   return m_mimeType;
 }
 
 BodyStreamBuffer* FetchResponseData::internalBuffer() const {
   if (m_internalResponse) {
     return m_internalResponse->m_buffer;
   }
   return m_buffer;
 }
 
 String FetchResponseData::internalMIMEType() const {
   if (m_internalResponse) {
     return m_internalResponse->mimeType();
   }
   return m_mimeType;
 }
 
+void FetchResponseData::setURLList(const Vector<KURL>& urlList) {
+  m_urlList = urlList;
+}
+
 FetchResponseData* FetchResponseData::clone(ScriptState* scriptState) {
   FetchResponseData* newResponse = create();
   newResponse->m_type = m_type;
   if (m_terminationReason) {
     newResponse->m_terminationReason = wrapUnique(new TerminationReason);
     *newResponse->m_terminationReason = *m_terminationReason;
   }
-  newResponse->m_url = m_url;
+  newResponse->setURLList(m_urlList);
   newResponse->m_status = m_status;
   newResponse->m_statusMessage = m_statusMessage;
   newResponse->m_headerList = m_headerList->clone();
   newResponse->m_mimeType = m_mimeType;
   newResponse->m_responseTime = m_responseTime;
   newResponse->m_cacheStorageCacheName = m_cacheStorageCacheName;
   newResponse->m_corsExposedHeaderNames = m_corsExposedHeaderNames;
 
   switch (m_type) {
     case BasicType:
@@ skipping 33 matching lines @@
 
 void FetchResponseData::populateWebServiceWorkerResponse(
     WebServiceWorkerResponse& response) {
   if (m_internalResponse) {
     m_internalResponse->populateWebServiceWorkerResponse(response);
     response.setResponseType(fetchTypeToWebType(m_type));
     response.setCorsExposedHeaderNames(
         headerSetToWebVector(m_corsExposedHeaderNames));
     return;
   }
-
-  response.setURL(url());
+  response.setURLList(m_urlList);
   response.setStatus(status());
   response.setStatusText(statusMessage());
   response.setResponseType(fetchTypeToWebType(m_type));
   response.setResponseTime(responseTime());
   response.setCacheStorageCacheName(cacheStorageCacheName());
   response.setCorsExposedHeaderNames(
       headerSetToWebVector(m_corsExposedHeaderNames));
   for (size_t i = 0; i < headerList()->size(); ++i) {
     const FetchHeaderList::Header* header = headerList()->list()[i].get();
     response.appendHeader(header->first, header->second);
@@ skipping 20 matching lines @@
   }
 }
 
 DEFINE_TRACE(FetchResponseData) {
   visitor->trace(m_headerList);
   visitor->trace(m_internalResponse);
   visitor->trace(m_buffer);
 }
 
 }  // namespace blink