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

content/renderer/service_worker/service_worker_script_context.cc

 // 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 "content/renderer/service_worker/service_worker_script_context.h"
 
 #include <map>
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 17 matching lines @@
     ThreadSafeSender* sender,
     int routing_id,
     int client_id,
     const base::string16& message,
     scoped_ptr<blink::WebMessagePortChannelArray> channels) {
   sender->Send(new ServiceWorkerHostMsg_PostMessageToDocument(
       routing_id, client_id, message,
       WebMessagePortChannelImpl::ExtractMessagePortIDs(channels.release())));
 }
 
+blink::WebURLRequest::FetchRequestMode GetBlinkFetchRequestMode(
+    FetchRequestMode mode) {
+  switch (mode) {
+    case FETCH_REQUEST_MODE_SAME_ORIGIN:
+      return blink::WebURLRequest::FetchRequestModeSameOrigin;

[jochen (gone - plz use gerrit), 2014/09/29 12:56:44]

nit. you could just use ASSERT_MATCHING_ENUM() and static_cast<> instead of this
switch (and the one above in the other direction).

[horo, 2014/09/30 02:15:39]

Done.

+      break;
+    case FETCH_REQUEST_MODE_NO_CORS:
+      return blink::WebURLRequest::FetchRequestModeNoCORS;
+      break;
+    case FETCH_REQUEST_MODE_CORS:
+      return blink::WebURLRequest::FetchRequestModeCORS;
+      break;
+    case FETCH_REQUEST_MODE_CORS_WITH_FORCED_PREFLIGHT:
+      return blink::WebURLRequest::FetchRequestModeCORSWithForcedPreflight;
+      break;
+  }
+  NOTREACHED();
+  return blink::WebURLRequest::FetchRequestModeNoCORS;
+}
+
 }  // namespace
 
 ServiceWorkerScriptContext::ServiceWorkerScriptContext(
     EmbeddedWorkerContextClient* embedded_context,
     blink::WebServiceWorkerContextProxy* proxy)
     : cache_storage_dispatcher_(new ServiceWorkerCacheStorageDispatcher(this)),
       embedded_context_(embedded_context),
       proxy_(proxy) {
 }
 
@@ skipping 106 matching lines @@
        ++it) {
     webRequest.setHeader(blink::WebString::fromUTF8(it->first),
                          blink::WebString::fromUTF8(it->second));
   }
   if (!request.blob_uuid.empty()) {
     webRequest.setBlob(blink::WebString::fromUTF8(request.blob_uuid),
                        request.blob_size);
   }
   webRequest.setReferrer(blink::WebString::fromUTF8(request.referrer.spec()),
                          blink::WebReferrerPolicyDefault);
+  webRequest.setMode(GetBlinkFetchRequestMode(request.mode));
   webRequest.setIsReload(request.is_reload);
   proxy_->dispatchFetchEvent(request_id, webRequest);
 }
 
 void ServiceWorkerScriptContext::OnSyncEvent(int request_id) {
   TRACE_EVENT0("ServiceWorker",
                "ServiceWorkerScriptContext::OnSyncEvent");
   proxy_->dispatchSyncEvent(request_id);
 }
 
@@ skipping 36 matching lines @@
     return;
   }
   scoped_ptr<blink::WebServiceWorkerClientsInfo> info(
       new blink::WebServiceWorkerClientsInfo);
   info->clientIDs = client_ids;
   callbacks->onSuccess(info.release());
   pending_clients_callbacks_.Remove(request_id);
 }
 
 }  // namespace content