Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(567)

Side by Side Diff: content/renderer/service_worker/embedded_worker_context_client.cc

Issue 293083002: Add a blob field to ServiceWorkerFetchResponse and read the blob (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix merge conflict Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/content_tests.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/service_worker/embedded_worker_context_client.h" 5 #include "content/renderer/service_worker/embedded_worker_context_client.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/message_loop/message_loop_proxy.h" 8 #include "base/message_loop/message_loop_proxy.h"
9 #include "base/pickle.h" 9 #include "base/pickle.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 std::map<std::string, std::string> headers; 250 std::map<std::string, std::string> headers;
251 const blink::WebVector<blink::WebString>& header_keys = 251 const blink::WebVector<blink::WebString>& header_keys =
252 web_response.getHeaderKeys(); 252 web_response.getHeaderKeys();
253 for (size_t i = 0; i < header_keys.size(); ++i) { 253 for (size_t i = 0; i < header_keys.size(); ++i) {
254 const base::string16& key = header_keys[i]; 254 const base::string16& key = header_keys[i];
255 headers[base::UTF16ToUTF8(key)] = 255 headers[base::UTF16ToUTF8(key)] =
256 base::UTF16ToUTF8(web_response.getHeader(key)); 256 base::UTF16ToUTF8(web_response.getHeader(key));
257 } 257 }
258 ServiceWorkerResponse response(web_response.status(), 258 ServiceWorkerResponse response(web_response.status(),
259 web_response.statusText().utf8(), 259 web_response.statusText().utf8(),
260 headers); 260 headers,
261 std::string());
261 script_context_->DidHandleFetchEvent( 262 script_context_->DidHandleFetchEvent(
262 request_id, SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, response); 263 request_id, SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, response);
263 } 264 }
264 265
265 void EmbeddedWorkerContextClient::didHandleSyncEvent(int request_id) { 266 void EmbeddedWorkerContextClient::didHandleSyncEvent(int request_id) {
266 DCHECK(script_context_); 267 DCHECK(script_context_);
267 script_context_->DidHandleSyncEvent(request_id); 268 script_context_->DidHandleSyncEvent(request_id);
268 } 269 }
269 270
270 blink::WebServiceWorkerNetworkProvider* 271 blink::WebServiceWorkerNetworkProvider*
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 } 310 }
310 311
311 void EmbeddedWorkerContextClient::SendWorkerStarted() { 312 void EmbeddedWorkerContextClient::SendWorkerStarted() {
312 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); 313 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread());
313 Send(new EmbeddedWorkerHostMsg_WorkerStarted( 314 Send(new EmbeddedWorkerHostMsg_WorkerStarted(
314 WorkerTaskRunner::Instance()->CurrentWorkerId(), 315 WorkerTaskRunner::Instance()->CurrentWorkerId(),
315 embedded_worker_id_)); 316 embedded_worker_id_));
316 } 317 }
317 318
318 } // namespace content 319 } // namespace content
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698