OLD | NEW |
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/browser/service_worker/embedded_worker_instance.h" | 5 #include "content/browser/service_worker/embedded_worker_instance.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
455 return; | 455 return; |
456 } | 456 } |
457 DCHECK(status_ == EmbeddedWorkerStatus::STOPPED); | 457 DCHECK(status_ == EmbeddedWorkerStatus::STOPPED); |
458 | 458 |
459 DCHECK(!params->pause_after_download || !params->is_installed); | 459 DCHECK(!params->pause_after_download || !params->is_installed); |
460 DCHECK_NE(kInvalidServiceWorkerVersionId, params->service_worker_version_id); | 460 DCHECK_NE(kInvalidServiceWorkerVersionId, params->service_worker_version_id); |
461 step_time_ = base::TimeTicks::Now(); | 461 step_time_ = base::TimeTicks::Now(); |
462 status_ = EmbeddedWorkerStatus::STARTING; | 462 status_ = EmbeddedWorkerStatus::STARTING; |
463 starting_phase_ = ALLOCATING_PROCESS; | 463 starting_phase_ = ALLOCATING_PROCESS; |
464 network_accessed_for_script_ = false; | 464 network_accessed_for_script_ = false; |
465 interface_registry_.reset(new service_manager::InterfaceRegistry); | 465 interface_registry_ = base::MakeUnique<service_manager::InterfaceRegistry>( |
| 466 service_manager::Identity(), service_manager::InterfaceProviderSpec()); |
466 remote_interfaces_.reset(new service_manager::InterfaceProvider); | 467 remote_interfaces_.reset(new service_manager::InterfaceProvider); |
467 for (auto& observer : listener_list_) | 468 for (auto& observer : listener_list_) |
468 observer.OnStarting(); | 469 observer.OnStarting(); |
469 | 470 |
470 params->embedded_worker_id = embedded_worker_id_; | 471 params->embedded_worker_id = embedded_worker_id_; |
471 params->worker_devtools_agent_route_id = MSG_ROUTING_NONE; | 472 params->worker_devtools_agent_route_id = MSG_ROUTING_NONE; |
472 params->wait_for_debugger = false; | 473 params->wait_for_debugger = false; |
473 params->settings.v8_cache_options = GetV8CacheOptions(); | 474 params->settings.v8_cache_options = GetV8CacheOptions(); |
474 | 475 |
475 mojom::EmbeddedWorkerInstanceClientRequest request; | 476 mojom::EmbeddedWorkerInstanceClientRequest request; |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
615 | 616 |
616 ServiceWorkerStatusCode EmbeddedWorkerInstance::SendMojoStartWorker( | 617 ServiceWorkerStatusCode EmbeddedWorkerInstance::SendMojoStartWorker( |
617 std::unique_ptr<EmbeddedWorkerStartParams> params) { | 618 std::unique_ptr<EmbeddedWorkerStartParams> params) { |
618 if (!context_) | 619 if (!context_) |
619 return SERVICE_WORKER_ERROR_ABORT; | 620 return SERVICE_WORKER_ERROR_ABORT; |
620 service_manager::mojom::InterfaceProviderPtr remote_interfaces; | 621 service_manager::mojom::InterfaceProviderPtr remote_interfaces; |
621 service_manager::mojom::InterfaceProviderRequest request = | 622 service_manager::mojom::InterfaceProviderRequest request = |
622 mojo::GetProxy(&remote_interfaces); | 623 mojo::GetProxy(&remote_interfaces); |
623 remote_interfaces_->Bind(std::move(remote_interfaces)); | 624 remote_interfaces_->Bind(std::move(remote_interfaces)); |
624 service_manager::mojom::InterfaceProviderPtr exposed_interfaces; | 625 service_manager::mojom::InterfaceProviderPtr exposed_interfaces; |
625 interface_registry_->Bind(mojo::GetProxy(&exposed_interfaces)); | 626 interface_registry_->Bind(mojo::GetProxy(&exposed_interfaces), |
| 627 service_manager::Identity(), |
| 628 service_manager::InterfaceProviderSpec()); |
626 client_->StartWorker(*params, std::move(exposed_interfaces), | 629 client_->StartWorker(*params, std::move(exposed_interfaces), |
627 std::move(request)); | 630 std::move(request)); |
628 registry_->BindWorkerToProcess(process_id(), embedded_worker_id()); | 631 registry_->BindWorkerToProcess(process_id(), embedded_worker_id()); |
629 TRACE_EVENT_ASYNC_STEP_PAST1("ServiceWorker", "EmbeddedWorkerInstance::Start", | 632 TRACE_EVENT_ASYNC_STEP_PAST1("ServiceWorker", "EmbeddedWorkerInstance::Start", |
630 this, "SendStartWorker", "Status", "mojo"); | 633 this, "SendStartWorker", "Status", "mojo"); |
631 OnStartWorkerMessageSent(); | 634 OnStartWorkerMessageSent(); |
632 return SERVICE_WORKER_OK; | 635 return SERVICE_WORKER_OK; |
633 } | 636 } |
634 | 637 |
635 void EmbeddedWorkerInstance::OnStartWorkerMessageSent() { | 638 void EmbeddedWorkerInstance::OnStartWorkerMessageSent() { |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
726 | 729 |
727 thread_id_ = thread_id; | 730 thread_id_ = thread_id; |
728 for (auto& observer : listener_list_) | 731 for (auto& observer : listener_list_) |
729 observer.OnThreadStarted(); | 732 observer.OnThreadStarted(); |
730 | 733 |
731 // This code is for BackgroundSync and FetchEvent, which have been already | 734 // This code is for BackgroundSync and FetchEvent, which have been already |
732 // mojofied. Interfaces are exchanged at StartWorker when mojo for the service | 735 // mojofied. Interfaces are exchanged at StartWorker when mojo for the service |
733 // worker is enabled, so this code isn't necessary when the flag is enabled. | 736 // worker is enabled, so this code isn't necessary when the flag is enabled. |
734 if (!ServiceWorkerUtils::IsMojoForServiceWorkerEnabled()) { | 737 if (!ServiceWorkerUtils::IsMojoForServiceWorkerEnabled()) { |
735 service_manager::mojom::InterfaceProviderPtr exposed_interfaces; | 738 service_manager::mojom::InterfaceProviderPtr exposed_interfaces; |
736 interface_registry_->Bind(mojo::GetProxy(&exposed_interfaces)); | 739 interface_registry_->Bind(mojo::GetProxy(&exposed_interfaces), |
| 740 service_manager::Identity(), |
| 741 service_manager::InterfaceProviderSpec()); |
737 service_manager::mojom::InterfaceProviderPtr remote_interfaces; | 742 service_manager::mojom::InterfaceProviderPtr remote_interfaces; |
738 service_manager::mojom::InterfaceProviderRequest request = | 743 service_manager::mojom::InterfaceProviderRequest request = |
739 mojo::GetProxy(&remote_interfaces); | 744 mojo::GetProxy(&remote_interfaces); |
740 remote_interfaces_->Bind(std::move(remote_interfaces)); | 745 remote_interfaces_->Bind(std::move(remote_interfaces)); |
741 BrowserThread::PostTask( | 746 BrowserThread::PostTask( |
742 BrowserThread::UI, FROM_HERE, | 747 BrowserThread::UI, FROM_HERE, |
743 base::Bind(SetupMojoOnUIThread, process_id(), thread_id_, | 748 base::Bind(SetupMojoOnUIThread, process_id(), thread_id_, |
744 base::Passed(&request), | 749 base::Passed(&request), |
745 base::Passed(exposed_interfaces.PassInterface()))); | 750 base::Passed(exposed_interfaces.PassInterface()))); |
746 } | 751 } |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
965 case SCRIPT_READ_FINISHED: | 970 case SCRIPT_READ_FINISHED: |
966 return "Script read finished"; | 971 return "Script read finished"; |
967 case STARTING_PHASE_MAX_VALUE: | 972 case STARTING_PHASE_MAX_VALUE: |
968 NOTREACHED(); | 973 NOTREACHED(); |
969 } | 974 } |
970 NOTREACHED() << phase; | 975 NOTREACHED() << phase; |
971 return std::string(); | 976 return std::string(); |
972 } | 977 } |
973 | 978 |
974 } // namespace content | 979 } // namespace content |
OLD | NEW |