Chromium Code Reviews| 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 <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 31 #include "content/child/thread_safe_sender.h" | 31 #include "content/child/thread_safe_sender.h" |
| 32 #include "content/child/web_data_consumer_handle_impl.h" | 32 #include "content/child/web_data_consumer_handle_impl.h" |
| 33 #include "content/child/web_url_loader_impl.h" | 33 #include "content/child/web_url_loader_impl.h" |
| 34 #include "content/child/webmessageportchannel_impl.h" | 34 #include "content/child/webmessageportchannel_impl.h" |
| 35 #include "content/common/devtools_messages.h" | 35 #include "content/common/devtools_messages.h" |
| 36 #include "content/common/message_port_messages.h" | 36 #include "content/common/message_port_messages.h" |
| 37 #include "content/common/service_worker/embedded_worker_messages.h" | 37 #include "content/common/service_worker/embedded_worker_messages.h" |
| 38 #include "content/common/service_worker/service_worker_event_dispatcher.mojom.h" | 38 #include "content/common/service_worker/service_worker_event_dispatcher.mojom.h" |
| 39 #include "content/common/service_worker/service_worker_messages.h" | 39 #include "content/common/service_worker/service_worker_messages.h" |
| 40 #include "content/common/service_worker/service_worker_status_code.h" | 40 #include "content/common/service_worker/service_worker_status_code.h" |
| 41 #include "content/common/service_worker/service_worker_type_converters.h" | |
| 41 #include "content/common/service_worker/service_worker_utils.h" | 42 #include "content/common/service_worker/service_worker_utils.h" |
| 42 #include "content/public/common/push_event_payload.h" | 43 #include "content/public/common/push_event_payload.h" |
| 43 #include "content/public/common/referrer.h" | 44 #include "content/public/common/referrer.h" |
| 44 #include "content/public/renderer/content_renderer_client.h" | 45 #include "content/public/renderer/content_renderer_client.h" |
| 45 #include "content/public/renderer/document_state.h" | 46 #include "content/public/renderer/document_state.h" |
| 46 #include "content/renderer/devtools/devtools_agent.h" | 47 #include "content/renderer/devtools/devtools_agent.h" |
| 47 #include "content/renderer/render_thread_impl.h" | 48 #include "content/renderer/render_thread_impl.h" |
| 48 #include "content/renderer/service_worker/embedded_worker_devtools_agent.h" | 49 #include "content/renderer/service_worker/embedded_worker_devtools_agent.h" |
| 49 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" | 50 #include "content/renderer/service_worker/embedded_worker_dispatcher.h" |
| 50 #include "content/renderer/service_worker/embedded_worker_instance_client_impl.h " | 51 #include "content/renderer/service_worker/embedded_worker_instance_client_impl.h " |
| 51 #include "content/renderer/service_worker/service_worker_type_util.h" | 52 #include "content/renderer/service_worker/service_worker_type_util.h" |
| 52 #include "ipc/ipc_message.h" | 53 #include "ipc/ipc_message.h" |
| 53 #include "ipc/ipc_message_macros.h" | 54 #include "ipc/ipc_message_macros.h" |
| 54 #include "third_party/WebKit/public/platform/URLConversion.h" | 55 #include "third_party/WebKit/public/platform/URLConversion.h" |
| 55 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h" | 56 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h" |
| 56 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" | 57 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" |
| 57 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" | 58 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" |
| 58 #include "third_party/WebKit/public/platform/WebString.h" | 59 #include "third_party/WebKit/public/platform/WebString.h" |
| 59 #include "third_party/WebKit/public/platform/WebURLResponse.h" | 60 #include "third_party/WebKit/public/platform/WebURLResponse.h" |
| 60 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificati onData.h" | 61 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificati onData.h" |
| 62 #include "third_party/WebKit/public/platform/modules/payments/WebPaymentAppReque stData.h" | |
| 61 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWor kerClientQueryOptions.h" | 63 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWor kerClientQueryOptions.h" |
| 62 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWor kerError.h" | 64 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWor kerError.h" |
| 63 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWor kerRequest.h" | 65 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWor kerRequest.h" |
| 64 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWor kerResponse.h" | 66 #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWor kerResponse.h" |
| 65 #include "third_party/WebKit/public/web/WebDataSource.h" | 67 #include "third_party/WebKit/public/web/WebDataSource.h" |
| 66 #include "third_party/WebKit/public/web/modules/serviceworker/WebServiceWorkerCo ntextClient.h" | 68 #include "third_party/WebKit/public/web/modules/serviceworker/WebServiceWorkerCo ntextClient.h" |
| 67 #include "third_party/WebKit/public/web/modules/serviceworker/WebServiceWorkerCo ntextProxy.h" | 69 #include "third_party/WebKit/public/web/modules/serviceworker/WebServiceWorkerCo ntextProxy.h" |
| 68 #include "third_party/WebKit/public/web/modules/serviceworker/WebServiceWorkerNe tworkProvider.h" | 70 #include "third_party/WebKit/public/web/modules/serviceworker/WebServiceWorkerNe tworkProvider.h" |
| 69 | 71 |
| 70 namespace content { | 72 namespace content { |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 197 struct ServiceWorkerContextClient::WorkerContextData { | 199 struct ServiceWorkerContextClient::WorkerContextData { |
| 198 using ClientsCallbacksMap = | 200 using ClientsCallbacksMap = |
| 199 IDMap<std::unique_ptr<blink::WebServiceWorkerClientsCallbacks>>; | 201 IDMap<std::unique_ptr<blink::WebServiceWorkerClientsCallbacks>>; |
| 200 using ClaimClientsCallbacksMap = | 202 using ClaimClientsCallbacksMap = |
| 201 IDMap<std::unique_ptr<blink::WebServiceWorkerClientsClaimCallbacks>>; | 203 IDMap<std::unique_ptr<blink::WebServiceWorkerClientsClaimCallbacks>>; |
| 202 using ClientCallbacksMap = | 204 using ClientCallbacksMap = |
| 203 IDMap<std::unique_ptr<blink::WebServiceWorkerClientCallbacks>>; | 205 IDMap<std::unique_ptr<blink::WebServiceWorkerClientCallbacks>>; |
| 204 using SkipWaitingCallbacksMap = | 206 using SkipWaitingCallbacksMap = |
| 205 IDMap<std::unique_ptr<blink::WebServiceWorkerSkipWaitingCallbacks>>; | 207 IDMap<std::unique_ptr<blink::WebServiceWorkerSkipWaitingCallbacks>>; |
| 206 using SyncEventCallbacksMap = IDMap<std::unique_ptr<const SyncCallback>>; | 208 using SyncEventCallbacksMap = IDMap<std::unique_ptr<const SyncCallback>>; |
| 209 using PaymentRequestEventCallbacksMap = | |
| 210 IDMap<std::unique_ptr<const PaymentRequestEventCallback>>; | |
| 207 using PushEventCallbacksMap = | 211 using PushEventCallbacksMap = |
| 208 IDMap<std::unique_ptr<const DispatchPushEventCallback>>; | 212 IDMap<std::unique_ptr<const DispatchPushEventCallback>>; |
| 209 using FetchEventCallbacksMap = IDMap<std::unique_ptr<const FetchCallback>>; | 213 using FetchEventCallbacksMap = IDMap<std::unique_ptr<const FetchCallback>>; |
| 210 using ExtendableMessageEventCallbacksMap = | 214 using ExtendableMessageEventCallbacksMap = |
| 211 IDMap<std::unique_ptr<const DispatchExtendableMessageEventCallback>>; | 215 IDMap<std::unique_ptr<const DispatchExtendableMessageEventCallback>>; |
| 212 using NavigationPreloadRequestsMap = IDMap< | 216 using NavigationPreloadRequestsMap = IDMap< |
| 213 std::unique_ptr<ServiceWorkerContextClient::NavigationPreloadRequest>>; | 217 std::unique_ptr<ServiceWorkerContextClient::NavigationPreloadRequest>>; |
| 214 | 218 |
| 215 explicit WorkerContextData(ServiceWorkerContextClient* owner) | 219 explicit WorkerContextData(ServiceWorkerContextClient* owner) |
| 216 : event_dispatcher_binding(owner), | 220 : event_dispatcher_binding(owner), |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 231 | 235 |
| 232 // Pending callbacks for SkipWaiting(). | 236 // Pending callbacks for SkipWaiting(). |
| 233 SkipWaitingCallbacksMap skip_waiting_callbacks; | 237 SkipWaitingCallbacksMap skip_waiting_callbacks; |
| 234 | 238 |
| 235 // Pending callbacks for ClaimClients(). | 239 // Pending callbacks for ClaimClients(). |
| 236 ClaimClientsCallbacksMap claim_clients_callbacks; | 240 ClaimClientsCallbacksMap claim_clients_callbacks; |
| 237 | 241 |
| 238 // Pending callbacks for Background Sync Events. | 242 // Pending callbacks for Background Sync Events. |
| 239 SyncEventCallbacksMap sync_event_callbacks; | 243 SyncEventCallbacksMap sync_event_callbacks; |
| 240 | 244 |
| 245 // Pending callbacks for Payment Request Events. | |
| 246 PaymentRequestEventCallbacksMap payment_request_event_callbacks; | |
| 247 | |
| 241 // Pending callbacks for Push Events. | 248 // Pending callbacks for Push Events. |
| 242 PushEventCallbacksMap push_event_callbacks; | 249 PushEventCallbacksMap push_event_callbacks; |
| 243 | 250 |
| 244 // Pending callbacks for Fetch Events. | 251 // Pending callbacks for Fetch Events. |
| 245 FetchEventCallbacksMap fetch_event_callbacks; | 252 FetchEventCallbacksMap fetch_event_callbacks; |
| 246 | 253 |
| 247 // Pending callbacks for Extendable Message Events. | 254 // Pending callbacks for Extendable Message Events. |
| 248 ExtendableMessageEventCallbacksMap message_event_callbacks; | 255 ExtendableMessageEventCallbacksMap message_event_callbacks; |
| 249 | 256 |
| 250 // Pending navigation preload requests. | 257 // Pending navigation preload requests. |
| (...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 743 blink::WebServiceWorkerEventResult result, | 750 blink::WebServiceWorkerEventResult result, |
| 744 double event_dispatch_time) { | 751 double event_dispatch_time) { |
| 745 const SyncCallback* callback = | 752 const SyncCallback* callback = |
| 746 context_->sync_event_callbacks.Lookup(request_id); | 753 context_->sync_event_callbacks.Lookup(request_id); |
| 747 DCHECK(callback); | 754 DCHECK(callback); |
| 748 callback->Run(EventResultToStatus(result), | 755 callback->Run(EventResultToStatus(result), |
| 749 base::Time::FromDoubleT(event_dispatch_time)); | 756 base::Time::FromDoubleT(event_dispatch_time)); |
| 750 context_->sync_event_callbacks.Remove(request_id); | 757 context_->sync_event_callbacks.Remove(request_id); |
| 751 } | 758 } |
| 752 | 759 |
| 760 void ServiceWorkerContextClient::didHandlePaymentRequestEvent( | |
| 761 int request_id, | |
| 762 blink::WebServiceWorkerEventResult result, | |
| 763 double event_dispatch_time) { | |
| 764 const PaymentRequestEventCallback* callback = | |
| 765 context_->payment_request_event_callbacks.Lookup(request_id); | |
| 766 DCHECK(callback); | |
| 767 callback->Run(EventResultToStatus(result), | |
| 768 base::Time::FromDoubleT(event_dispatch_time)); | |
| 769 context_->payment_request_event_callbacks.Remove(request_id); | |
| 770 } | |
| 771 | |
| 753 blink::WebServiceWorkerNetworkProvider* | 772 blink::WebServiceWorkerNetworkProvider* |
| 754 ServiceWorkerContextClient::createServiceWorkerNetworkProvider( | 773 ServiceWorkerContextClient::createServiceWorkerNetworkProvider( |
| 755 blink::WebDataSource* data_source) { | 774 blink::WebDataSource* data_source) { |
| 756 DCHECK(main_thread_task_runner_->RunsTasksOnCurrentThread()); | 775 DCHECK(main_thread_task_runner_->RunsTasksOnCurrentThread()); |
| 757 | 776 |
| 758 // Create a content::ServiceWorkerNetworkProvider for this data source so | 777 // Create a content::ServiceWorkerNetworkProvider for this data source so |
| 759 // we can observe its requests. | 778 // we can observe its requests. |
| 760 std::unique_ptr<ServiceWorkerNetworkProvider> provider = | 779 std::unique_ptr<ServiceWorkerNetworkProvider> provider = |
| 761 base::MakeUnique<ServiceWorkerNetworkProvider>( | 780 base::MakeUnique<ServiceWorkerNetworkProvider>( |
| 762 MSG_ROUTING_NONE, SERVICE_WORKER_PROVIDER_FOR_CONTROLLER, | 781 MSG_ROUTING_NONE, SERVICE_WORKER_PROVIDER_FOR_CONTROLLER, |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 861 | 880 |
| 862 // TODO(jkarlin): Make this blink::WebString::FromUTF8Lenient once | 881 // TODO(jkarlin): Make this blink::WebString::FromUTF8Lenient once |
| 863 // https://crrev.com/1768063002/ lands. | 882 // https://crrev.com/1768063002/ lands. |
| 864 proxy_->dispatchSyncEvent(request_id, blink::WebString::fromUTF8(tag), | 883 proxy_->dispatchSyncEvent(request_id, blink::WebString::fromUTF8(tag), |
| 865 web_last_chance); | 884 web_last_chance); |
| 866 } | 885 } |
| 867 | 886 |
| 868 void ServiceWorkerContextClient::DispatchPaymentRequestEvent( | 887 void ServiceWorkerContextClient::DispatchPaymentRequestEvent( |
| 869 payments::mojom::PaymentAppRequestDataPtr data, | 888 payments::mojom::PaymentAppRequestDataPtr data, |
| 870 const DispatchPaymentRequestEventCallback& callback) { | 889 const DispatchPaymentRequestEventCallback& callback) { |
| 871 NOTIMPLEMENTED(); | 890 int request_id = context_->payment_request_event_callbacks.Add( |
|
tommyt
2017/01/23 12:54:30
I think it might be better to do the following her
zino
2017/02/01 09:24:48
Good point. Yes, we might have to do that later.
B
tommyt
2017/02/01 09:42:00
I agree. Let's leave this for later.
| |
| 891 base::MakeUnique<PaymentRequestEventCallback>(callback)); | |
| 892 blink::WebPaymentAppRequestData webData = | |
| 893 mojo::ConvertTo<blink::WebPaymentAppRequestData>(std::move(data)); | |
| 894 proxy_->dispatchPaymentRequestEvent(request_id, webData); | |
| 872 } | 895 } |
| 873 | 896 |
| 874 void ServiceWorkerContextClient::Send(IPC::Message* message) { | 897 void ServiceWorkerContextClient::Send(IPC::Message* message) { |
| 875 sender_->Send(message); | 898 sender_->Send(message); |
| 876 } | 899 } |
| 877 | 900 |
| 878 void ServiceWorkerContextClient::SendWorkerStarted() { | 901 void ServiceWorkerContextClient::SendWorkerStarted() { |
| 879 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); | 902 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); |
| 880 TRACE_EVENT_ASYNC_END0("ServiceWorker", | 903 TRACE_EVENT_ASYNC_END0("ServiceWorker", |
| 881 "ServiceWorkerContextClient::StartingWorkerContext", | 904 "ServiceWorkerContextClient::StartingWorkerContext", |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1250 } | 1273 } |
| 1251 | 1274 |
| 1252 base::WeakPtr<ServiceWorkerContextClient> | 1275 base::WeakPtr<ServiceWorkerContextClient> |
| 1253 ServiceWorkerContextClient::GetWeakPtr() { | 1276 ServiceWorkerContextClient::GetWeakPtr() { |
| 1254 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); | 1277 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); |
| 1255 DCHECK(context_); | 1278 DCHECK(context_); |
| 1256 return context_->weak_factory.GetWeakPtr(); | 1279 return context_->weak_factory.GetWeakPtr(); |
| 1257 } | 1280 } |
| 1258 | 1281 |
| 1259 } // namespace content | 1282 } // namespace content |
| OLD | NEW |