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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 } | 79 } |
80 BrowserThread::PostTask( | 80 BrowserThread::PostTask( |
81 BrowserThread::IO, | 81 BrowserThread::IO, |
82 FROM_HERE, | 82 FROM_HERE, |
83 base::Bind(callback, worker_devtools_agent_route_id, wait_for_debugger)); | 83 base::Bind(callback, worker_devtools_agent_route_id, wait_for_debugger)); |
84 } | 84 } |
85 | 85 |
86 void SetupMojoOnUIThread( | 86 void SetupMojoOnUIThread( |
87 int process_id, | 87 int process_id, |
88 int thread_id, | 88 int thread_id, |
89 mojo::InterfaceRequest<mojo::InterfaceProvider> services, | 89 mojo::shell::mojom::InterfaceProviderRequest services, |
90 mojo::InterfacePtrInfo<mojo::InterfaceProvider> exposed_services) { | 90 mojo::shell::mojom::InterfaceProviderPtrInfo exposed_services) { |
91 RenderProcessHost* rph = RenderProcessHost::FromID(process_id); | 91 RenderProcessHost* rph = RenderProcessHost::FromID(process_id); |
92 // |rph| or its ServiceRegistry may be NULL in unit tests. | 92 // |rph| or its ServiceRegistry may be NULL in unit tests. |
93 if (!rph || !rph->GetServiceRegistry()) | 93 if (!rph || !rph->GetServiceRegistry()) |
94 return; | 94 return; |
95 EmbeddedWorkerSetupPtr setup; | 95 EmbeddedWorkerSetupPtr setup; |
96 rph->GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&setup)); | 96 rph->GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&setup)); |
97 setup->ExchangeInterfaceProviders( | 97 setup->ExchangeInterfaceProviders( |
98 thread_id, std::move(services), | 98 thread_id, std::move(services), |
99 mojo::MakeProxy(std::move(exposed_services))); | 99 mojo::MakeProxy(std::move(exposed_services))); |
100 } | 100 } |
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
504 "EmbeddedWorkerInstance.ScriptLoadWithoutNetworkAccess", | 504 "EmbeddedWorkerInstance.ScriptLoadWithoutNetworkAccess", |
505 base::TimeTicks::Now() - start_timing_); | 505 base::TimeTicks::Now() - start_timing_); |
506 } | 506 } |
507 // Reset |start_timing_| to measure the time excluding the process | 507 // Reset |start_timing_| to measure the time excluding the process |
508 // allocation time and the script loading time. | 508 // allocation time and the script loading time. |
509 start_timing_ = base::TimeTicks::Now(); | 509 start_timing_ = base::TimeTicks::Now(); |
510 } | 510 } |
511 thread_id_ = thread_id; | 511 thread_id_ = thread_id; |
512 FOR_EACH_OBSERVER(Listener, listener_list_, OnThreadStarted()); | 512 FOR_EACH_OBSERVER(Listener, listener_list_, OnThreadStarted()); |
513 | 513 |
514 mojo::InterfaceProviderPtr exposed_services; | 514 mojo::shell::mojom::InterfaceProviderPtr exposed_services; |
515 service_registry_->Bind(GetProxy(&exposed_services)); | 515 service_registry_->Bind(GetProxy(&exposed_services)); |
516 mojo::InterfaceProviderPtr services; | 516 mojo::shell::mojom::InterfaceProviderPtr services; |
517 mojo::InterfaceRequest<mojo::InterfaceProvider> services_request = | 517 mojo::shell::mojom::InterfaceProviderRequest services_request = |
518 GetProxy(&services); | 518 GetProxy(&services); |
519 BrowserThread::PostTask( | 519 BrowserThread::PostTask( |
520 BrowserThread::UI, FROM_HERE, | 520 BrowserThread::UI, FROM_HERE, |
521 base::Bind(SetupMojoOnUIThread, process_id(), thread_id_, | 521 base::Bind(SetupMojoOnUIThread, process_id(), thread_id_, |
522 base::Passed(&services_request), | 522 base::Passed(&services_request), |
523 base::Passed(exposed_services.PassInterface()))); | 523 base::Passed(exposed_services.PassInterface()))); |
524 service_registry_->BindRemoteServiceProvider(std::move(services)); | 524 service_registry_->BindRemoteServiceProvider(std::move(services)); |
525 } | 525 } |
526 | 526 |
527 void EmbeddedWorkerInstance::OnScriptLoadFailed() { | 527 void EmbeddedWorkerInstance::OnScriptLoadFailed() { |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
703 case SCRIPT_READ_FINISHED: | 703 case SCRIPT_READ_FINISHED: |
704 return "Script read finished"; | 704 return "Script read finished"; |
705 case STARTING_PHASE_MAX_VALUE: | 705 case STARTING_PHASE_MAX_VALUE: |
706 NOTREACHED(); | 706 NOTREACHED(); |
707 } | 707 } |
708 NOTREACHED() << phase; | 708 NOTREACHED() << phase; |
709 return std::string(); | 709 return std::string(); |
710 } | 710 } |
711 | 711 |
712 } // namespace content | 712 } // namespace content |
OLD | NEW |