OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_context_client.h" | 5 #include "content/renderer/service_worker/service_worker_context_client.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
12 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
13 #include "base/thread_task_runner_handle.h" | 13 #include "base/thread_task_runner_handle.h" |
14 #include "base/threading/thread_checker.h" | 14 #include "base/threading/thread_checker.h" |
15 #include "base/threading/thread_local.h" | 15 #include "base/threading/thread_local.h" |
16 #include "base/trace_event/trace_event.h" | 16 #include "base/trace_event/trace_event.h" |
17 #include "content/child/navigator_connect/service_port_dispatcher_impl.h" | 17 #include "content/child/navigator_connect/service_port_dispatcher_impl.h" |
18 #include "content/child/notifications/notification_data_conversions.h" | 18 #include "content/child/notifications/notification_data_conversions.h" |
19 #include "content/child/request_extra_data.h" | 19 #include "content/child/request_extra_data.h" |
20 #include "content/child/service_worker/service_worker_dispatcher.h" | 20 #include "content/child/service_worker/service_worker_dispatcher.h" |
| 21 #include "content/child/service_worker/service_worker_handle_reference.h" |
21 #include "content/child/service_worker/service_worker_network_provider.h" | 22 #include "content/child/service_worker/service_worker_network_provider.h" |
22 #include "content/child/service_worker/service_worker_provider_context.h" | 23 #include "content/child/service_worker/service_worker_provider_context.h" |
23 #include "content/child/service_worker/service_worker_registration_handle_refere
nce.h" | 24 #include "content/child/service_worker/service_worker_registration_handle_refere
nce.h" |
24 #include "content/child/service_worker/web_service_worker_impl.h" | 25 #include "content/child/service_worker/web_service_worker_impl.h" |
25 #include "content/child/service_worker/web_service_worker_provider_impl.h" | 26 #include "content/child/service_worker/web_service_worker_provider_impl.h" |
26 #include "content/child/service_worker/web_service_worker_registration_impl.h" | 27 #include "content/child/service_worker/web_service_worker_registration_impl.h" |
27 #include "content/child/thread_safe_sender.h" | 28 #include "content/child/thread_safe_sender.h" |
28 #include "content/child/webmessageportchannel_impl.h" | 29 #include "content/child/webmessageportchannel_impl.h" |
29 #include "content/common/devtools_messages.h" | 30 #include "content/common/devtools_messages.h" |
30 #include "content/common/geofencing_messages.h" | 31 #include "content/common/geofencing_messages.h" |
(...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
735 void ServiceWorkerContextClient::OnActivateEvent(int request_id) { | 736 void ServiceWorkerContextClient::OnActivateEvent(int request_id) { |
736 TRACE_EVENT0("ServiceWorker", | 737 TRACE_EVENT0("ServiceWorker", |
737 "ServiceWorkerContextClient::OnActivateEvent"); | 738 "ServiceWorkerContextClient::OnActivateEvent"); |
738 proxy_->dispatchActivateEvent(request_id); | 739 proxy_->dispatchActivateEvent(request_id); |
739 } | 740 } |
740 | 741 |
741 void ServiceWorkerContextClient::OnExtendableMessageEvent( | 742 void ServiceWorkerContextClient::OnExtendableMessageEvent( |
742 int request_id, | 743 int request_id, |
743 const base::string16& message, | 744 const base::string16& message, |
744 const std::vector<TransferredMessagePort>& sent_message_ports, | 745 const std::vector<TransferredMessagePort>& sent_message_ports, |
745 const std::vector<int>& new_routing_ids) { | 746 const std::vector<int>& new_routing_ids, |
| 747 const ExtendableMessageEventSource& source) { |
746 TRACE_EVENT0("ServiceWorker", | 748 TRACE_EVENT0("ServiceWorker", |
747 "ServiceWorkerContextClient::OnExtendableMessageEvent"); | 749 "ServiceWorkerContextClient::OnExtendableMessageEvent"); |
748 blink::WebMessagePortChannelArray ports = | 750 blink::WebMessagePortChannelArray ports = |
749 WebMessagePortChannelImpl::CreatePorts( | 751 WebMessagePortChannelImpl::CreatePorts( |
750 sent_message_ports, new_routing_ids, main_thread_task_runner_); | 752 sent_message_ports, new_routing_ids, main_thread_task_runner_); |
751 proxy_->dispatchExtendableMessageEvent(request_id, message, ports); | 753 |
| 754 if (source.client_info.IsValid()) { |
| 755 blink::WebServiceWorkerClientInfo web_client = |
| 756 ToWebServiceWorkerClientInfo(source.client_info); |
| 757 proxy_->dispatchExtendableMessageEvent(request_id, message, ports, |
| 758 web_client); |
| 759 return; |
| 760 } |
| 761 |
| 762 DCHECK(source.service_worker_info.IsValid()); |
| 763 scoped_ptr<ServiceWorkerHandleReference> handle = |
| 764 ServiceWorkerHandleReference::Adopt(source.service_worker_info, |
| 765 sender_.get()); |
| 766 ServiceWorkerDispatcher* dispatcher = |
| 767 ServiceWorkerDispatcher::GetOrCreateThreadSpecificInstance( |
| 768 sender_.get(), main_thread_task_runner_.get()); |
| 769 scoped_refptr<WebServiceWorkerImpl> worker = |
| 770 dispatcher->GetOrCreateServiceWorker(std::move(handle)); |
| 771 proxy_->dispatchExtendableMessageEvent( |
| 772 request_id, message, ports, WebServiceWorkerImpl::CreateHandle(worker)); |
752 } | 773 } |
753 | 774 |
754 void ServiceWorkerContextClient::OnInstallEvent(int request_id) { | 775 void ServiceWorkerContextClient::OnInstallEvent(int request_id) { |
755 TRACE_EVENT0("ServiceWorker", | 776 TRACE_EVENT0("ServiceWorker", |
756 "ServiceWorkerContextClient::OnInstallEvent"); | 777 "ServiceWorkerContextClient::OnInstallEvent"); |
757 proxy_->dispatchInstallEvent(request_id); | 778 proxy_->dispatchInstallEvent(request_id); |
758 } | 779 } |
759 | 780 |
760 void ServiceWorkerContextClient::OnFetchEvent( | 781 void ServiceWorkerContextClient::OnFetchEvent( |
761 int request_id, | 782 int request_id, |
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1071 } | 1092 } |
1072 | 1093 |
1073 base::WeakPtr<ServiceWorkerContextClient> | 1094 base::WeakPtr<ServiceWorkerContextClient> |
1074 ServiceWorkerContextClient::GetWeakPtr() { | 1095 ServiceWorkerContextClient::GetWeakPtr() { |
1075 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); | 1096 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); |
1076 DCHECK(context_); | 1097 DCHECK(context_); |
1077 return context_->weak_factory.GetWeakPtr(); | 1098 return context_->weak_factory.GetWeakPtr(); |
1078 } | 1099 } |
1079 | 1100 |
1080 } // namespace content | 1101 } // namespace content |
OLD | NEW |