Chromium Code Reviews| Index: content/browser/service_worker/embedded_worker_registry.cc |
| diff --git a/content/browser/service_worker/embedded_worker_registry.cc b/content/browser/service_worker/embedded_worker_registry.cc |
| index e8c0c86c16d922aca7384566b4e94ed64be672e9..9cfb21e3f6e5c7f8de1d6ce89b4cd072eab1763f 100644 |
| --- a/content/browser/service_worker/embedded_worker_registry.cc |
| +++ b/content/browser/service_worker/embedded_worker_registry.cc |
| @@ -43,12 +43,6 @@ std::unique_ptr<EmbeddedWorkerInstance> EmbeddedWorkerRegistry::CreateWorker() { |
| return worker; |
| } |
| -ServiceWorkerStatusCode EmbeddedWorkerRegistry::StopWorker( |
| - int process_id, int embedded_worker_id) { |
| - return Send(process_id, |
| - new EmbeddedWorkerMsg_StopWorker(embedded_worker_id)); |
| -} |
| - |
| bool EmbeddedWorkerRegistry::OnMessageReceived(const IPC::Message& message, |
| int process_id) { |
| // TODO(kinuko): Move all EmbeddedWorker message handling from |
| @@ -79,108 +73,23 @@ void EmbeddedWorkerRegistry::Shutdown() { |
| } |
| } |
| -void EmbeddedWorkerRegistry::OnWorkerReadyForInspection( |
| - int process_id, |
| - int embedded_worker_id) { |
| - EmbeddedWorkerInstance* worker = |
| - GetWorkerForMessage(process_id, embedded_worker_id); |
| - if (!worker) |
| - return; |
| - worker->OnReadyForInspection(); |
| -} |
| - |
| -void EmbeddedWorkerRegistry::OnWorkerScriptLoaded(int process_id, |
| - int embedded_worker_id) { |
| - EmbeddedWorkerInstance* worker = |
| - GetWorkerForMessage(process_id, embedded_worker_id); |
| - if (!worker) |
| - return; |
| - worker->OnScriptLoaded(); |
| -} |
| - |
| -void EmbeddedWorkerRegistry::OnWorkerThreadStarted(int process_id, |
| - int thread_id, |
| - int embedded_worker_id) { |
| - EmbeddedWorkerInstance* worker = |
| - GetWorkerForMessage(process_id, embedded_worker_id); |
| - if (!worker) |
| - return; |
| - worker->OnThreadStarted(thread_id); |
| -} |
| - |
| -void EmbeddedWorkerRegistry::OnWorkerScriptLoadFailed(int process_id, |
| - int embedded_worker_id) { |
| - EmbeddedWorkerInstance* worker = |
| - GetWorkerForMessage(process_id, embedded_worker_id); |
| - if (!worker) |
| - return; |
| - worker->OnScriptLoadFailed(); |
| -} |
| - |
| -void EmbeddedWorkerRegistry::OnWorkerScriptEvaluated(int process_id, |
| - int embedded_worker_id, |
| - bool success) { |
| - EmbeddedWorkerInstance* worker = |
| - GetWorkerForMessage(process_id, embedded_worker_id); |
| - if (!worker) |
| - return; |
| - worker->OnScriptEvaluated(success); |
| -} |
| - |
| -void EmbeddedWorkerRegistry::OnWorkerStarted( |
| - int process_id, int embedded_worker_id) { |
| - EmbeddedWorkerInstance* worker = |
| - GetWorkerForMessage(process_id, embedded_worker_id); |
| - if (!worker) |
| - return; |
| - |
| +bool EmbeddedWorkerRegistry::OnWorkerStarted(int process_id, |
| + int embedded_worker_id) { |
| if (!base::ContainsKey(worker_process_map_, process_id) || |
| !base::ContainsKey(worker_process_map_[process_id], embedded_worker_id)) { |
| - return; |
| + return false; |
| } |
| - worker->OnStarted(); |
| lifetime_tracker_.StartTiming(embedded_worker_id); |
| + return true; |
| } |
| -void EmbeddedWorkerRegistry::OnWorkerStopped( |
| - int process_id, int embedded_worker_id) { |
| - EmbeddedWorkerInstance* worker = |
| - GetWorkerForMessage(process_id, embedded_worker_id); |
| - if (!worker) |
| - return; |
| +void EmbeddedWorkerRegistry::OnWorkerStoppedd(int process_id, |
|
shimazu
2017/04/10 05:09:22
nit: Stopped
leonhsl(Using Gerrit)
2017/04/10 06:10:36
Acknowledged. And thanks!
|
| + int embedded_worker_id) { |
| worker_process_map_[process_id].erase(embedded_worker_id); |
| - worker->OnStopped(); |
| lifetime_tracker_.StopTiming(embedded_worker_id); |
| } |
| -void EmbeddedWorkerRegistry::OnReportException( |
| - int embedded_worker_id, |
| - const base::string16& error_message, |
| - int line_number, |
| - int column_number, |
| - const GURL& source_url) { |
| - EmbeddedWorkerInstance* worker = GetWorker(embedded_worker_id); |
| - if (!worker) |
| - return; |
| - worker->OnReportException(error_message, line_number, column_number, |
| - source_url); |
| -} |
| - |
| -void EmbeddedWorkerRegistry::OnReportConsoleMessage( |
| - int embedded_worker_id, |
| - int source_identifier, |
| - int message_level, |
| - const base::string16& message, |
| - int line_number, |
| - const GURL& source_url) { |
| - EmbeddedWorkerInstance* worker = GetWorker(embedded_worker_id); |
| - if (!worker) |
| - return; |
| - worker->OnReportConsoleMessage(source_identifier, message_level, message, |
| - line_number, source_url); |
| -} |
| - |
| void EmbeddedWorkerRegistry::OnDevToolsAttached(int embedded_worker_id) { |
| lifetime_tracker_.AbortTiming(embedded_worker_id); |
| } |