| 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 "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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 std::map<std::string, std::string> headers; | 251 std::map<std::string, std::string> headers; |
| 252 const blink::WebVector<blink::WebString>& header_keys = | 252 const blink::WebVector<blink::WebString>& header_keys = |
| 253 web_response.getHeaderKeys(); | 253 web_response.getHeaderKeys(); |
| 254 for (size_t i = 0; i < header_keys.size(); ++i) { | 254 for (size_t i = 0; i < header_keys.size(); ++i) { |
| 255 const base::string16& key = header_keys[i]; | 255 const base::string16& key = header_keys[i]; |
| 256 headers[base::UTF16ToUTF8(key)] = | 256 headers[base::UTF16ToUTF8(key)] = |
| 257 base::UTF16ToUTF8(web_response.getHeader(key)); | 257 base::UTF16ToUTF8(web_response.getHeader(key)); |
| 258 } | 258 } |
| 259 ServiceWorkerResponse response(web_response.status(), | 259 ServiceWorkerResponse response(web_response.status(), |
| 260 web_response.statusText().utf8(), | 260 web_response.statusText().utf8(), |
| 261 headers); | 261 headers, |
| 262 std::string()); |
| 262 #else | 263 #else |
| 263 // TODO(kinuko): Cleanup this once blink side patch is rolled. | 264 // TODO(kinuko): Cleanup this once blink side patch is rolled. |
| 264 ServiceWorkerResponse response(web_response.statusCode(), | 265 ServiceWorkerResponse response(web_response.statusCode(), |
| 265 web_response.statusText().utf8(), | 266 web_response.statusText().utf8(), |
| 266 web_response.method().utf8(), | 267 web_response.method().utf8(), |
| 267 std::map<std::string, std::string>()); | 268 std::map<std::string, std::string>(), |
| 269 std::string()); |
| 268 #endif | 270 #endif |
| 269 script_context_->DidHandleFetchEvent( | 271 script_context_->DidHandleFetchEvent( |
| 270 request_id, SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, response); | 272 request_id, SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, response); |
| 271 } | 273 } |
| 272 | 274 |
| 273 void EmbeddedWorkerContextClient::didHandleSyncEvent(int request_id) { | 275 void EmbeddedWorkerContextClient::didHandleSyncEvent(int request_id) { |
| 274 DCHECK(script_context_); | 276 DCHECK(script_context_); |
| 275 script_context_->DidHandleSyncEvent(request_id); | 277 script_context_->DidHandleSyncEvent(request_id); |
| 276 } | 278 } |
| 277 | 279 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 } | 319 } |
| 318 | 320 |
| 319 void EmbeddedWorkerContextClient::SendWorkerStarted() { | 321 void EmbeddedWorkerContextClient::SendWorkerStarted() { |
| 320 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); | 322 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); |
| 321 Send(new EmbeddedWorkerHostMsg_WorkerStarted( | 323 Send(new EmbeddedWorkerHostMsg_WorkerStarted( |
| 322 WorkerTaskRunner::Instance()->CurrentWorkerId(), | 324 WorkerTaskRunner::Instance()->CurrentWorkerId(), |
| 323 embedded_worker_id_)); | 325 embedded_worker_id_)); |
| 324 } | 326 } |
| 325 | 327 |
| 326 } // namespace content | 328 } // namespace content |
| OLD | NEW |