[ServiceWorker] Plumbing the request mode from the renderer to the ServiceWorker. [1/2 blink]

Source/modules/serviceworkers/FetchRequestData.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 "config.h"
 #include "FetchRequestData.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "core/loader/ThreadableLoader.h"
 #include "modules/serviceworkers/FetchHeaderList.h"
 #include "platform/network/ResourceRequest.h"
 #include "public/platform/WebServiceWorkerRequest.h"
+#include "public/platform/WebURLRequest.h"
 
 namespace blink {
 
 FetchRequestData* FetchRequestData::create()
 {
     return new FetchRequestData();
 }
 
 FetchRequestData* FetchRequestData::create(ExecutionContext* context)
 {
     FetchRequestData* request = FetchRequestData::create();
     if (context->isDocument())
         request->m_referrer.setClient(blink::Referrer(context->url().strippedForUseAsReferrer(), toDocument(context)->referrerPolicy()));
     else
         request->m_referrer.setClient(blink::Referrer(context->url().strippedForUseAsReferrer(), ReferrerPolicyDefault));
     return request;
 }
 
 FetchRequestData* FetchRequestData::create(const WebServiceWorkerRequest& webRequest)
 {
     FetchRequestData* request = FetchRequestData::create();
     request->m_url = webRequest.url();
     request->m_method = webRequest.method();
     for (HTTPHeaderMap::const_iterator it = webRequest.headers().begin(); it != webRequest.headers().end(); ++it)
         request->m_headerList->append(it->key, it->value);
     request->m_blobDataHandle = webRequest.blobDataHandle();
     request->m_referrer.setURL(webRequest.referrer());
+    switch (webRequest.mode()) {
+    case WebURLRequest::FetchRequestModeSameOrigin:
+        request->setMode(FetchRequestData::SameOriginMode);

[Mike West, 2014/09/25 12:35:53]

I think FrameRequestData should simply share the new platform-level enum. You
don't need to do that refactoring in this CL, but I think it's the right
direction to go.

[horo, 2014/09/25 14:02:16]

Acknowledged.

+        break;
+    case WebURLRequest::FetchRequestModeNoCORS:
+        request->setMode(FetchRequestData::NoCORSMode);
+        break;
+    case WebURLRequest::FetchRequestModeCORS:
+        request->setMode(FetchRequestData::CORSMode);
+        break;
+    case WebURLRequest::FetchRequestModeCORSWithForcedPreflight:
+        request->setMode(FetchRequestData::CORSWithForcedPreflight);
+        break;
+    default:
+        ASSERT_NOT_REACHED();
+        break;
+    }
     return request;
 }
 
 FetchRequestData* FetchRequestData::createRestrictedCopy(ExecutionContext* context, PassRefPtr<SecurityOrigin> origin) const
 {
     // "To make a restricted copy of a request |request|, run these steps:
     // 1. Let |r| be a new request whose url is |request|'s url, method is
     // |request|'s method, header list is a copy of |request|'s header list,
     // body is a tee of |request|'s body, client is entry settings object's
     // global object, origin is entry settings object's origin, referrer is
@@ skipping 49 matching lines @@
     , m_responseTainting(BasicTainting)
 {
 }
 
 void FetchRequestData::trace(Visitor* visitor)
 {
     visitor->trace(m_headerList);
 }
 
 } // namespace blink