ServiceWorker: support Request.{url,method,origin,headers} [chromium] (2/3)

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 "base/logging.h"
+#include "base/strings/utf_string_conversions.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/service_worker/service_worker_messages.h"
 #include "content/renderer/service_worker/embedded_worker_context_client.h"
 #include "ipc/ipc_message.h"
+#include "third_party/WebKit/public/platform/WebServiceWorkerRequest.h"
 #include "third_party/WebKit/public/web/WebServiceWorkerContextClient.h"
 #include "third_party/WebKit/public/web/WebServiceWorkerContextProxy.h"
 
 namespace content {
 
 namespace {
 
 void SendPostMessageToDocumentOnMainThread(
     ThreadSafeSender* sender,
     int routing_id,
@@ skipping 91 matching lines @@
 }
 
 void ServiceWorkerScriptContext::OnInstallEvent(int request_id,
                                                 int active_version_id) {
   proxy_->dispatchInstallEvent(request_id);
 }
 
 void ServiceWorkerScriptContext::OnFetchEvent(
     int request_id,
     const ServiceWorkerFetchRequest& request) {
-  // TODO(falken): Pass in the request.
-  proxy_->dispatchFetchEvent(request_id);
+  blink::WebServiceWorkerRequest webRequest;
+  webRequest.setURL(blink::WebString(base::UTF8ToUTF16(request.url.spec())));

[falken, 2014/05/30 03:39:17]

It seems more common in the codebase to use WebString::fromUTF8, is there a
reason to use UTF8ToUTF16 instead?

[horo, 2014/05/30 04:55:18]

I changed to use WebURL in WebServiceWorkerRequest.

+  webRequest.setMethod(blink::WebString(base::UTF8ToUTF16(request.method)));
+  webRequest.setOrigin(
+      blink::WebString(base::UTF8ToUTF16(request.url.GetOrigin().spec())));
+  for (std::map<std::string, std::string>::const_iterator it =
+           request.headers.begin();
+       it != request.headers.end();
+       ++it) {
+    webRequest.setHeader(blink::WebString(base::UTF8ToUTF16(it->first)),
+                         blink::WebString(base::UTF8ToUTF16(it->second)));
+  }
+  proxy_->dispatchFetchEvent(request_id, webRequest);
 }
 
 void ServiceWorkerScriptContext::OnSyncEvent(int request_id) {
   proxy_->dispatchSyncEvent(request_id);
 }
 
 void ServiceWorkerScriptContext::OnPostMessage(
     const base::string16& message,
     const std::vector<int>& sent_message_port_ids,
     const std::vector<int>& new_routing_ids) {
@@ skipping 23 matching lines @@
   info->clientIDs = client_ids;
   callbacks->onSuccess(info.release());
   pending_clients_callbacks_.Remove(request_id);
 }
 
 int ServiceWorkerScriptContext::GetRoutingID() const {
   return embedded_context_->embedded_worker_id();
 }
 
 }  // namespace content