content/renderer/service_worker/service_worker_script_context.cc - Issue 305893003: ServiceWorker: support Request.{url,method,origin,headers} [chromium] (2/3)

Unified Diff: content/renderer/service_worker/service_worker_script_context.cc

Issue 305893003: ServiceWorker: support Request.{url,method,origin,headers} [chromium] (2/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add browser test for Request. Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/service_worker/service_worker_browsertest.cc ('k') | content/test/data/service_worker/fetch_event.js » ('j') | content/test/data/service_worker/fetch_event.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/service_worker/service_worker_script_context.cc

diff --git a/content/renderer/service_worker/service_worker_script_context.cc b/content/renderer/service_worker/service_worker_script_context.cc

index bb3bf9a1b1821c566df3fa7776a540a3e301fbc8..9f3b1ea3d1565b5d4d34a561fd14103d9c11a4f3 100644

--- a/content/renderer/service_worker/service_worker_script_context.cc

+++ b/content/renderer/service_worker/service_worker_script_context.cc

@@ -5,11 +5,13 @@

#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"

@@ -121,8 +123,19 @@ void ServiceWorkerScriptContext::OnInstallEvent(int 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 WebStr

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) {