Merge to M58: Support redirect responses for NavigationPreload

third_party/WebKit/Source/modules/serviceworkers/FetchEvent.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/serviceworkers/FetchEvent.h"
 
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/ToV8.h"
 #include "bindings/core/v8/V8HiddenValue.h"
 #include "modules/fetch/BytesConsumerForDataConsumerHandle.h"
 #include "modules/fetch/Request.h"
 #include "modules/fetch/Response.h"
 #include "modules/serviceworkers/ServiceWorkerError.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScope.h"
+#include "platform/network/NetworkUtils.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerError.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 FetchEvent* FetchEvent::create(ScriptState* scriptState,
                                const AtomicString& type,
                                const FetchEventInit& initializer) {
@@ skipping 100 matching lines @@
   responseData->setURLList(urlList);
   responseData->setStatus(response->httpStatusCode());
   responseData->setStatusMessage(response->httpStatusText());
   responseData->setResponseTime(response->toResourceResponse().responseTime());
   const HTTPHeaderMap& headers(
       response->toResourceResponse().httpHeaderFields());
   for (const auto& header : headers) {
     responseData->headerList()->append(header.key, header.value);
   }
   FetchResponseData* taintedResponse =
-      responseData->createBasicFilteredResponse();
+      NetworkUtils::isRedirectResponseCode(response->httpStatusCode())
+          ? responseData->createOpaqueRedirectFilteredResponse()
+          : responseData->createBasicFilteredResponse();
   m_preloadResponseProperty->resolve(
       Response::create(scriptState->getExecutionContext(), taintedResponse));
 }
 
 void FetchEvent::onNavigationPreloadError(
     ScriptState* scriptState,
     std::unique_ptr<WebServiceWorkerError> error) {
   if (!scriptState->contextIsValid())
     return;
   DCHECK(m_preloadResponseProperty);
   m_preloadResponseProperty->reject(
       ServiceWorkerError::take(nullptr, *error.get()));
 }
 
 DEFINE_TRACE(FetchEvent) {
   visitor->trace(m_observer);
   visitor->trace(m_request);
   visitor->trace(m_preloadResponseProperty);
   ExtendableEvent::trace(visitor);
 }
 
 }  // namespace blink