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

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

Issue 2847983002: Use unique_ptr for Create{ServiceWorkerNetworkProvider,ApplicationCacheHost} (Closed)
Patch Set: addressed comments Created 3 years, 7 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
OLDNEW
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 <map> 7 #include <map>
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 1045 matching lines...) Expand 10 before | Expand all | Expand 10 after
1056 int payment_request_id, 1056 int payment_request_id,
1057 blink::WebServiceWorkerEventResult result, 1057 blink::WebServiceWorkerEventResult result,
1058 double event_dispatch_time) { 1058 double event_dispatch_time) {
1059 DispatchPaymentRequestEventCallback callback = 1059 DispatchPaymentRequestEventCallback callback =
1060 std::move(context_->payment_request_event_callbacks[payment_request_id]); 1060 std::move(context_->payment_request_event_callbacks[payment_request_id]);
1061 std::move(callback).Run(EventResultToStatus(result), 1061 std::move(callback).Run(EventResultToStatus(result),
1062 base::Time::FromDoubleT(event_dispatch_time)); 1062 base::Time::FromDoubleT(event_dispatch_time));
1063 context_->payment_request_event_callbacks.erase(payment_request_id); 1063 context_->payment_request_event_callbacks.erase(payment_request_id);
1064 } 1064 }
1065 1065
1066 blink::WebServiceWorkerNetworkProvider* 1066 std::unique_ptr<blink::WebServiceWorkerNetworkProvider>
1067 ServiceWorkerContextClient::CreateServiceWorkerNetworkProvider() { 1067 ServiceWorkerContextClient::CreateServiceWorkerNetworkProvider() {
1068 DCHECK(main_thread_task_runner_->RunsTasksOnCurrentThread()); 1068 DCHECK(main_thread_task_runner_->RunsTasksOnCurrentThread());
1069 1069
1070 // Create a content::ServiceWorkerNetworkProvider for this data source so 1070 // Create a content::ServiceWorkerNetworkProvider for this data source so
1071 // we can observe its requests. 1071 // we can observe its requests.
1072 std::unique_ptr<ServiceWorkerNetworkProvider> provider = 1072 std::unique_ptr<ServiceWorkerNetworkProvider> provider =
1073 base::MakeUnique<ServiceWorkerNetworkProvider>( 1073 base::MakeUnique<ServiceWorkerNetworkProvider>(
1074 MSG_ROUTING_NONE, SERVICE_WORKER_PROVIDER_FOR_CONTROLLER, 1074 MSG_ROUTING_NONE, SERVICE_WORKER_PROVIDER_FOR_CONTROLLER,
1075 true /* is_parent_frame_secure */); 1075 true /* is_parent_frame_secure */);
1076 provider_context_ = provider->context(); 1076 provider_context_ = provider->context();
1077 network_provider_id_ = provider->provider_id(); 1077 network_provider_id_ = provider->provider_id();
1078 1078
1079 // Tell the network provider about which version to load. 1079 // Tell the network provider about which version to load.
1080 provider->SetServiceWorkerVersionId(service_worker_version_id_, 1080 provider->SetServiceWorkerVersionId(service_worker_version_id_,
1081 embedded_worker_id_); 1081 embedded_worker_id_);
1082 1082
1083 // Blink is responsible for deleting the returned object. 1083 // Blink is responsible for deleting the returned object.
1084 return new WebServiceWorkerNetworkProviderImpl(std::move(provider)); 1084 return base::MakeUnique<WebServiceWorkerNetworkProviderImpl>(
1085 std::move(provider));
1085 } 1086 }
1086 1087
1087 std::unique_ptr<blink::WebWorkerFetchContext> 1088 std::unique_ptr<blink::WebWorkerFetchContext>
1088 ServiceWorkerContextClient::CreateServiceWorkerFetchContext() { 1089 ServiceWorkerContextClient::CreateServiceWorkerFetchContext() {
1089 DCHECK(main_thread_task_runner_->RunsTasksOnCurrentThread()); 1090 DCHECK(main_thread_task_runner_->RunsTasksOnCurrentThread());
1090 DCHECK(base::FeatureList::IsEnabled(features::kOffMainThreadFetch)); 1091 DCHECK(base::FeatureList::IsEnabled(features::kOffMainThreadFetch));
1091 mojom::WorkerURLLoaderFactoryProviderPtr worker_url_loader_factory_provider; 1092 mojom::WorkerURLLoaderFactoryProviderPtr worker_url_loader_factory_provider;
1092 RenderThreadImpl::current() 1093 RenderThreadImpl::current()
1093 ->blink_platform_impl() 1094 ->blink_platform_impl()
1094 ->GetInterfaceProvider() 1095 ->GetInterfaceProvider()
1095 ->GetInterface(mojo::MakeRequest(&worker_url_loader_factory_provider)); 1096 ->GetInterface(mojo::MakeRequest(&worker_url_loader_factory_provider));
1096 1097
1097 // Blink is responsible for deleting the returned object. 1098 // Blink is responsible for deleting the returned object.
1098 return base::MakeUnique<ServiceWorkerFetchContextImpl>( 1099 return base::MakeUnique<ServiceWorkerFetchContextImpl>(
1099 worker_url_loader_factory_provider.PassInterface(), network_provider_id_); 1100 worker_url_loader_factory_provider.PassInterface(), network_provider_id_);
1100 } 1101 }
1101 1102
1102 blink::WebServiceWorkerProvider* 1103 std::unique_ptr<blink::WebServiceWorkerProvider>
1103 ServiceWorkerContextClient::CreateServiceWorkerProvider() { 1104 ServiceWorkerContextClient::CreateServiceWorkerProvider() {
1104 DCHECK(main_thread_task_runner_->RunsTasksOnCurrentThread()); 1105 DCHECK(main_thread_task_runner_->RunsTasksOnCurrentThread());
1105 DCHECK(provider_context_); 1106 DCHECK(provider_context_);
1106 1107
1107 // Blink is responsible for deleting the returned object. 1108 // Blink is responsible for deleting the returned object.
1108 return new WebServiceWorkerProviderImpl( 1109 return base::MakeUnique<WebServiceWorkerProviderImpl>(
1109 sender_.get(), provider_context_.get()); 1110 sender_.get(), provider_context_.get());
1110 } 1111 }
1111 1112
1112 void ServiceWorkerContextClient::PostMessageToClient( 1113 void ServiceWorkerContextClient::PostMessageToClient(
1113 const blink::WebString& uuid, 1114 const blink::WebString& uuid,
1114 const blink::WebString& message, 1115 const blink::WebString& message,
1115 blink::WebMessagePortChannelArray channels) { 1116 blink::WebMessagePortChannelArray channels) {
1116 Send(new ServiceWorkerHostMsg_PostMessageToClient( 1117 Send(new ServiceWorkerHostMsg_PostMessageToClient(
1117 GetRoutingID(), uuid.Utf8(), message.Utf16(), 1118 GetRoutingID(), uuid.Utf8(), message.Utf16(),
1118 WebMessagePortChannelImpl::ExtractMessagePorts(std::move(channels)))); 1119 WebMessagePortChannelImpl::ExtractMessagePorts(std::move(channels))));
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
1653 } 1654 }
1654 1655
1655 base::WeakPtr<ServiceWorkerContextClient> 1656 base::WeakPtr<ServiceWorkerContextClient>
1656 ServiceWorkerContextClient::GetWeakPtr() { 1657 ServiceWorkerContextClient::GetWeakPtr() {
1657 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread()); 1658 DCHECK(worker_task_runner_->RunsTasksOnCurrentThread());
1658 DCHECK(context_); 1659 DCHECK(context_);
1659 return context_->weak_factory.GetWeakPtr(); 1660 return context_->weak_factory.GetWeakPtr();
1660 } 1661 }
1661 1662
1662 } // namespace content 1663 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698