Chromium Code Reviews| 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/threading/thread_local.h" | 10 #include "base/threading/thread_local.h" |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 114 // worker_task_runner_->RunsTasksOnCurrentThread() returns false | 114 // worker_task_runner_->RunsTasksOnCurrentThread() returns false |
| 115 // (while we're still on the worker thread). | 115 // (while we're still on the worker thread). |
| 116 script_context_.reset(); | 116 script_context_.reset(); |
| 117 main_thread_proxy_->PostTask( | 117 main_thread_proxy_->PostTask( |
| 118 FROM_HERE, | 118 FROM_HERE, |
| 119 base::Bind(&CallWorkerContextDestroyedOnMainThread, | 119 base::Bind(&CallWorkerContextDestroyedOnMainThread, |
| 120 embedded_worker_id_)); | 120 embedded_worker_id_)); |
| 121 } | 121 } |
| 122 | 122 |
| 123 void EmbeddedWorkerContextClient::didHandleInstallEvent(int request_id) { | 123 void EmbeddedWorkerContextClient::didHandleInstallEvent(int request_id) { |
| 124 didHandleInstallEvent(request_id, false /* rejected */); | |
| 125 } | |
| 126 | |
| 127 void EmbeddedWorkerContextClient::didHandleInstallEvent(int request_id, | |
| 128 bool rejected) { | |
| 124 DCHECK(script_context_); | 129 DCHECK(script_context_); |
| 125 script_context_->DidHandleInstallEvent(request_id); | 130 script_context_->DidHandleInstallEvent( |
| 131 request_id, | |
| 132 rejected ? SERVICE_WORKER_INSTALL_EVENT_RESULT_REJECTED | |
| 133 : SERVICE_WORKER_INSTALL_EVENT_RESULT_COMPLETED); | |
|
kinuko
2014/03/25 11:16:49
It looks like we'll also need this rejected or com
falken
2014/03/26 07:53:56
Done.
| |
| 126 } | 134 } |
| 127 | 135 |
| 128 void EmbeddedWorkerContextClient::didHandleFetchEvent(int request_id) { | 136 void EmbeddedWorkerContextClient::didHandleFetchEvent(int request_id) { |
| 129 DCHECK(script_context_); | 137 DCHECK(script_context_); |
| 130 script_context_->DidHandleFetchEvent( | 138 script_context_->DidHandleFetchEvent( |
| 131 request_id, | 139 request_id, |
| 132 SERVICE_WORKER_FETCH_EVENT_RESULT_FALLBACK, | 140 SERVICE_WORKER_FETCH_EVENT_RESULT_FALLBACK, |
| 133 ServiceWorkerResponse()); | 141 ServiceWorkerResponse()); |
| 134 } | 142 } |
| 135 | 143 |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 157 } | 165 } |
| 158 | 166 |
| 159 void EmbeddedWorkerContextClient::SendWorkerStarted() { | 167 void EmbeddedWorkerContextClient::SendWorkerStarted() { |
| 160 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); | 168 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); |
| 161 sender_->Send(new EmbeddedWorkerHostMsg_WorkerStarted( | 169 sender_->Send(new EmbeddedWorkerHostMsg_WorkerStarted( |
| 162 WorkerTaskRunner::Instance()->CurrentWorkerId(), | 170 WorkerTaskRunner::Instance()->CurrentWorkerId(), |
| 163 embedded_worker_id_)); | 171 embedded_worker_id_)); |
| 164 } | 172 } |
| 165 | 173 |
| 166 } // namespace content | 174 } // namespace content |
| OLD | NEW |