OLD | NEW |
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 <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
283 const blink::WebVector<blink::WebString>& header_keys = | 283 const blink::WebVector<blink::WebString>& header_keys = |
284 web_response.getHeaderKeys(); | 284 web_response.getHeaderKeys(); |
285 for (size_t i = 0; i < header_keys.size(); ++i) { | 285 for (size_t i = 0; i < header_keys.size(); ++i) { |
286 const base::string16& key = header_keys[i]; | 286 const base::string16& key = header_keys[i]; |
287 headers[base::UTF16ToUTF8(key)] = | 287 headers[base::UTF16ToUTF8(key)] = |
288 base::UTF16ToUTF8(web_response.getHeader(key)); | 288 base::UTF16ToUTF8(web_response.getHeader(key)); |
289 } | 289 } |
290 ServiceWorkerResponse response(web_response.url(), | 290 ServiceWorkerResponse response(web_response.url(), |
291 web_response.status(), | 291 web_response.status(), |
292 web_response.statusText().utf8(), | 292 web_response.statusText().utf8(), |
| 293 web_response.responseType(), |
293 headers, | 294 headers, |
294 web_response.blobUUID().utf8()); | 295 web_response.blobUUID().utf8()); |
295 script_context_->DidHandleFetchEvent( | 296 script_context_->DidHandleFetchEvent( |
296 request_id, SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, response); | 297 request_id, SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, response); |
297 } | 298 } |
298 | 299 |
299 void EmbeddedWorkerContextClient::didHandleSyncEvent(int request_id) { | 300 void EmbeddedWorkerContextClient::didHandleSyncEvent(int request_id) { |
300 DCHECK(script_context_); | 301 DCHECK(script_context_); |
301 script_context_->DidHandleSyncEvent(request_id); | 302 script_context_->DidHandleSyncEvent(request_id); |
302 } | 303 } |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
344 | 345 |
345 void EmbeddedWorkerContextClient::SendWorkerStarted() { | 346 void EmbeddedWorkerContextClient::SendWorkerStarted() { |
346 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); | 347 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); |
347 TRACE_EVENT_ASYNC_END0("ServiceWorker", | 348 TRACE_EVENT_ASYNC_END0("ServiceWorker", |
348 "EmbeddedWorkerContextClient::StartingWorkerContext", | 349 "EmbeddedWorkerContextClient::StartingWorkerContext", |
349 this); | 350 this); |
350 Send(new EmbeddedWorkerHostMsg_WorkerStarted(embedded_worker_id_)); | 351 Send(new EmbeddedWorkerHostMsg_WorkerStarted(embedded_worker_id_)); |
351 } | 352 } |
352 | 353 |
353 } // namespace content | 354 } // namespace content |
OLD | NEW |