OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/service_worker_script_context.h" | 5 #include "content/renderer/service_worker/service_worker_script_context.h" |
6 | 6 |
7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
10 #include "content/child/thread_safe_sender.h" | 10 #include "content/child/thread_safe_sender.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 ThreadSafeSender* sender, | 27 ThreadSafeSender* sender, |
28 int routing_id, | 28 int routing_id, |
29 int client_id, | 29 int client_id, |
30 const base::string16& message, | 30 const base::string16& message, |
31 scoped_ptr<blink::WebMessagePortChannelArray> channels) { | 31 scoped_ptr<blink::WebMessagePortChannelArray> channels) { |
32 sender->Send(new ServiceWorkerHostMsg_PostMessageToDocument( | 32 sender->Send(new ServiceWorkerHostMsg_PostMessageToDocument( |
33 routing_id, client_id, message, | 33 routing_id, client_id, message, |
34 WebMessagePortChannelImpl::ExtractMessagePortIDs(channels.release()))); | 34 WebMessagePortChannelImpl::ExtractMessagePortIDs(channels.release()))); |
35 } | 35 } |
36 | 36 |
| 37 blink::WebURLRequest::FetchRequestMode GetBlinkFetchRequestMode( |
| 38 FetchRequestMode mode) { |
| 39 return static_cast<blink::WebURLRequest::FetchRequestMode>(mode); |
| 40 } |
| 41 |
37 } // namespace | 42 } // namespace |
38 | 43 |
39 ServiceWorkerScriptContext::ServiceWorkerScriptContext( | 44 ServiceWorkerScriptContext::ServiceWorkerScriptContext( |
40 EmbeddedWorkerContextClient* embedded_context, | 45 EmbeddedWorkerContextClient* embedded_context, |
41 blink::WebServiceWorkerContextProxy* proxy) | 46 blink::WebServiceWorkerContextProxy* proxy) |
42 : cache_storage_dispatcher_(new ServiceWorkerCacheStorageDispatcher(this)), | 47 : cache_storage_dispatcher_(new ServiceWorkerCacheStorageDispatcher(this)), |
43 embedded_context_(embedded_context), | 48 embedded_context_(embedded_context), |
44 proxy_(proxy) { | 49 proxy_(proxy) { |
45 } | 50 } |
46 | 51 |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 ++it) { | 175 ++it) { |
171 webRequest.setHeader(blink::WebString::fromUTF8(it->first), | 176 webRequest.setHeader(blink::WebString::fromUTF8(it->first), |
172 blink::WebString::fromUTF8(it->second)); | 177 blink::WebString::fromUTF8(it->second)); |
173 } | 178 } |
174 if (!request.blob_uuid.empty()) { | 179 if (!request.blob_uuid.empty()) { |
175 webRequest.setBlob(blink::WebString::fromUTF8(request.blob_uuid), | 180 webRequest.setBlob(blink::WebString::fromUTF8(request.blob_uuid), |
176 request.blob_size); | 181 request.blob_size); |
177 } | 182 } |
178 webRequest.setReferrer(blink::WebString::fromUTF8(request.referrer.spec()), | 183 webRequest.setReferrer(blink::WebString::fromUTF8(request.referrer.spec()), |
179 blink::WebReferrerPolicyDefault); | 184 blink::WebReferrerPolicyDefault); |
| 185 webRequest.setMode(GetBlinkFetchRequestMode(request.mode)); |
180 webRequest.setIsReload(request.is_reload); | 186 webRequest.setIsReload(request.is_reload); |
181 fetch_start_timings_[request_id] = base::TimeTicks::Now(); | 187 fetch_start_timings_[request_id] = base::TimeTicks::Now(); |
182 proxy_->dispatchFetchEvent(request_id, webRequest); | 188 proxy_->dispatchFetchEvent(request_id, webRequest); |
183 } | 189 } |
184 | 190 |
185 void ServiceWorkerScriptContext::OnSyncEvent(int request_id) { | 191 void ServiceWorkerScriptContext::OnSyncEvent(int request_id) { |
186 TRACE_EVENT0("ServiceWorker", | 192 TRACE_EVENT0("ServiceWorker", |
187 "ServiceWorkerScriptContext::OnSyncEvent"); | 193 "ServiceWorkerScriptContext::OnSyncEvent"); |
188 proxy_->dispatchSyncEvent(request_id); | 194 proxy_->dispatchSyncEvent(request_id); |
189 } | 195 } |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 return; | 233 return; |
228 } | 234 } |
229 scoped_ptr<blink::WebServiceWorkerClientsInfo> info( | 235 scoped_ptr<blink::WebServiceWorkerClientsInfo> info( |
230 new blink::WebServiceWorkerClientsInfo); | 236 new blink::WebServiceWorkerClientsInfo); |
231 info->clientIDs = client_ids; | 237 info->clientIDs = client_ids; |
232 callbacks->onSuccess(info.release()); | 238 callbacks->onSuccess(info.release()); |
233 pending_clients_callbacks_.Remove(request_id); | 239 pending_clients_callbacks_.Remove(request_id); |
234 } | 240 } |
235 | 241 |
236 } // namespace content | 242 } // namespace content |
OLD | NEW |