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

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

Issue 193723003: Identify service worker version at main resource load time. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
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/threading/thread_local.h" 10 #include "base/threading/thread_local.h"
11 #include "content/child/request_extra_data.h"
12 #include "content/child/service_worker/service_worker_network_provider.h"
11 #include "content/child/thread_safe_sender.h" 13 #include "content/child/thread_safe_sender.h"
12 #include "content/child/worker_task_runner.h" 14 #include "content/child/worker_task_runner.h"
13 #include "content/child/worker_thread_task_runner.h" 15 #include "content/child/worker_thread_task_runner.h"
14 #include "content/common/service_worker/embedded_worker_messages.h" 16 #include "content/common/service_worker/embedded_worker_messages.h"
15 #include "content/common/service_worker/service_worker_types.h" 17 #include "content/common/service_worker/service_worker_types.h"
18 #include "content/public/renderer/document_state.h"
16 #include "content/renderer/render_thread_impl.h" 19 #include "content/renderer/render_thread_impl.h"
17 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" 20 #include "content/renderer/service_worker/embedded_worker_dispatcher.h"
18 #include "content/renderer/service_worker/service_worker_script_context.h" 21 #include "content/renderer/service_worker/service_worker_script_context.h"
19 #include "ipc/ipc_message_macros.h" 22 #include "ipc/ipc_message_macros.h"
20 #include "third_party/WebKit/public/platform/WebServiceWorkerResponse.h" 23 #include "third_party/WebKit/public/platform/WebServiceWorkerResponse.h"
21 #include "third_party/WebKit/public/platform/WebString.h" 24 #include "third_party/WebKit/public/platform/WebString.h"
25 #include "third_party/WebKit/public/web/WebDataSource.h"
26 #include "third_party/WebKit/public/web/WebServiceWorkerNetworkProvider.h"
22 27
23 namespace content { 28 namespace content {
24 29
25 namespace { 30 namespace {
26 31
27 // For now client must be a per-thread instance. 32 // For now client must be a per-thread instance.
28 // TODO(kinuko): This needs to be refactored when we start using thread pool 33 // TODO(kinuko): This needs to be refactored when we start using thread pool
29 // or having multiple clients per one thread. 34 // or having multiple clients per one thread.
30 base::LazyInstance<base::ThreadLocalPointer<EmbeddedWorkerContextClient> >:: 35 base::LazyInstance<base::ThreadLocalPointer<EmbeddedWorkerContextClient> >::
31 Leaky g_worker_client_tls = LAZY_INSTANCE_INITIALIZER; 36 Leaky g_worker_client_tls = LAZY_INSTANCE_INITIALIZER;
32 37
33 void CallWorkerContextDestroyedOnMainThread(int embedded_worker_id) { 38 void CallWorkerContextDestroyedOnMainThread(int embedded_worker_id) {
34 if (!RenderThreadImpl::current() || 39 if (!RenderThreadImpl::current() ||
35 !RenderThreadImpl::current()->embedded_worker_dispatcher()) 40 !RenderThreadImpl::current()->embedded_worker_dispatcher())
36 return; 41 return;
37 RenderThreadImpl::current()->embedded_worker_dispatcher()-> 42 RenderThreadImpl::current()->embedded_worker_dispatcher()->
38 WorkerContextDestroyed(embedded_worker_id); 43 WorkerContextDestroyed(embedded_worker_id);
39 } 44 }
40 45
46 // We store an instance of this class in the "extra data" of the WebDataSource
47 // and attach a ServiceWorkerNetworkProvider to it as base::UserData.
48 // (see createServiceWorkerNetworkProvider).
49 class DataSourceExtraData
50 : public blink::WebDataSource::ExtraData,
51 public base::SupportsUserData {
52 public:
53 DataSourceExtraData() {}
54 virtual ~DataSourceExtraData() {}
55 };
56
57 // Called on the main thread only and blink owns it.
58 class WebServiceWorkerNetworkProviderImpl
59 : public blink::WebServiceWorkerNetworkProvider {
60 public:
61 // Blink calls this method for each request starting with the main script,
62 // we tag them with the provider id.
63 virtual void willSendRequest(
64 blink::WebDataSource* data_source,
65 blink::WebURLRequest& request) {
66 ServiceWorkerNetworkProvider* provider =
67 ServiceWorkerNetworkProvider::FromDocumentState(
68 static_cast<DataSourceExtraData*>(data_source->extraData()));
69 scoped_ptr<RequestExtraData> extra_data(new RequestExtraData);
70 extra_data->set_service_worker_provider_id(provider->provider_id());
71 request.setExtraData(extra_data.release());
72 }
73 };
74
41 } // namespace 75 } // namespace
42 76
43 EmbeddedWorkerContextClient* 77 EmbeddedWorkerContextClient*
44 EmbeddedWorkerContextClient::ThreadSpecificInstance() { 78 EmbeddedWorkerContextClient::ThreadSpecificInstance() {
45 return g_worker_client_tls.Pointer()->Get(); 79 return g_worker_client_tls.Pointer()->Get();
46 } 80 }
47 81
48 EmbeddedWorkerContextClient::EmbeddedWorkerContextClient( 82 EmbeddedWorkerContextClient::EmbeddedWorkerContextClient(
49 int embedded_worker_id, 83 int embedded_worker_id,
50 int64 service_worker_version_id, 84 int64 service_worker_version_id,
51 const GURL& script_url) 85 const GURL& script_url)
52 : embedded_worker_id_(embedded_worker_id), 86 : embedded_worker_id_(embedded_worker_id),
53 service_worker_version_id_(service_worker_version_id), 87 service_worker_version_id_(service_worker_version_id),
54 script_url_(script_url), 88 script_url_(script_url),
55 sender_(ChildThread::current()->thread_safe_sender()), 89 sender_(ChildThread::current()->thread_safe_sender()),
56 main_thread_proxy_(base::MessageLoopProxy::current()), 90 main_thread_proxy_(base::MessageLoopProxy::current()),
57 weak_factory_(this) { 91 weak_factory_(this) {
58 g_worker_client_tls.Pointer()->Set(this);
59 } 92 }
60 93
61 EmbeddedWorkerContextClient::~EmbeddedWorkerContextClient() { 94 EmbeddedWorkerContextClient::~EmbeddedWorkerContextClient() {
62 DCHECK(g_worker_client_tls.Pointer()->Get() != NULL); 95 DCHECK(g_worker_client_tls.Pointer()->Get() != NULL);
63 g_worker_client_tls.Pointer()->Set(NULL); 96 g_worker_client_tls.Pointer()->Set(NULL);
64 } 97 }
65 98
66 bool EmbeddedWorkerContextClient::OnMessageReceived( 99 bool EmbeddedWorkerContextClient::OnMessageReceived(
67 const IPC::Message& msg) { 100 const IPC::Message& msg) {
68 bool handled = true; 101 bool handled = true;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 const blink::WebServiceWorkerResponse& web_response) { 171 const blink::WebServiceWorkerResponse& web_response) {
139 DCHECK(script_context_); 172 DCHECK(script_context_);
140 ServiceWorkerResponse response(web_response.statusCode(), 173 ServiceWorkerResponse response(web_response.statusCode(),
141 web_response.statusText().utf8(), 174 web_response.statusText().utf8(),
142 web_response.method().utf8(), 175 web_response.method().utf8(),
143 std::map<std::string, std::string>()); 176 std::map<std::string, std::string>());
144 script_context_->DidHandleFetchEvent( 177 script_context_->DidHandleFetchEvent(
145 request_id, SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, response); 178 request_id, SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, response);
146 } 179 }
147 180
181 blink::WebServiceWorkerNetworkProvider*
182 EmbeddedWorkerContextClient::createServiceWorkerNetworkProvider(
183 blink::WebDataSource* data_source) {
184 // Create a content::ServiceWorkerNetworkProvider for this data source so
185 // we can observe its requests.
186 scoped_ptr<ServiceWorkerNetworkProvider> provider(
187 new ServiceWorkerNetworkProvider());
188
189 // Tell the network provider about which version to load.
190 provider->SetServiceWorkerVersionId(service_worker_version_id_);
191
192 // The provider is kept around for the lifetime of the DataSource
193 // and ownership is transferred to the DataSource.
194 DataSourceExtraData* extra_data = new DataSourceExtraData();
195 data_source->setExtraData(extra_data);
196 ServiceWorkerNetworkProvider::AttachToDocumentState(
197 extra_data, provider.Pass());
198
199 // Blink is responsible for deleting the returned object.
200 return new WebServiceWorkerNetworkProviderImpl();
201 }
202
148 void EmbeddedWorkerContextClient::OnSendMessageToWorker( 203 void EmbeddedWorkerContextClient::OnSendMessageToWorker(
149 int thread_id, 204 int thread_id,
150 int embedded_worker_id, 205 int embedded_worker_id,
151 int request_id, 206 int request_id,
152 const IPC::Message& message) { 207 const IPC::Message& message) {
153 if (!script_context_) 208 if (!script_context_)
154 return; 209 return;
155 DCHECK_EQ(embedded_worker_id_, embedded_worker_id); 210 DCHECK_EQ(embedded_worker_id_, embedded_worker_id);
156 script_context_->OnMessageReceived(request_id, message); 211 script_context_->OnMessageReceived(request_id, message);
157 } 212 }
158 213
159 void EmbeddedWorkerContextClient::SendWorkerStarted() { 214 void EmbeddedWorkerContextClient::SendWorkerStarted() {
160 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); 215 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread());
161 sender_->Send(new EmbeddedWorkerHostMsg_WorkerStarted( 216 sender_->Send(new EmbeddedWorkerHostMsg_WorkerStarted(
162 WorkerTaskRunner::Instance()->CurrentWorkerId(), 217 WorkerTaskRunner::Instance()->CurrentWorkerId(),
163 embedded_worker_id_)); 218 embedded_worker_id_));
164 } 219 }
165 220
166 } // namespace content 221 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698