Start EmbeddedWorker during registration - take 2

content/browser/service_worker/embedded_worker_registry.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/service_worker/embedded_worker_registry.h"
 
 #include "base/stl_util.h"
 #include "content/browser/service_worker/embedded_worker_instance.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/common/service_worker/embedded_worker_messages.h"
@@ skipping 26 matching lines @@
 }
 
 ServiceWorkerStatusCode EmbeddedWorkerRegistry::StopWorker(
     int process_id, int embedded_worker_id) {
   return Send(process_id,
               new EmbeddedWorkerMsg_StopWorker(embedded_worker_id));
 }
 
 void EmbeddedWorkerRegistry::OnWorkerStarted(
     int process_id, int thread_id, int embedded_worker_id) {
-  DCHECK(!ContainsKey(worker_process_map_, process_id));
+  DCHECK(!ContainsKey(worker_process_map_, process_id) ||
+         worker_process_map_[process_id].count(embedded_worker_id) == 0);
   WorkerInstanceMap::iterator found = worker_map_.find(embedded_worker_id);
   if (found == worker_map_.end()) {
     LOG(ERROR) << "Worker " << embedded_worker_id << " not registered";
     return;
   }
-  worker_process_map_[process_id] = embedded_worker_id;
+  worker_process_map_[process_id].insert(embedded_worker_id);
   DCHECK_EQ(found->second->process_id(), process_id);
   found->second->OnStarted(thread_id);
 }
 
 void EmbeddedWorkerRegistry::OnWorkerStopped(
     int process_id, int embedded_worker_id) {
   WorkerInstanceMap::iterator found = worker_map_.find(embedded_worker_id);
   if (found == worker_map_.end()) {
     LOG(ERROR) << "Worker " << embedded_worker_id << " not registered";
     return;
   }
   DCHECK_EQ(found->second->process_id(), process_id);
-  worker_process_map_.erase(process_id);
+  worker_process_map_[process_id].erase(embedded_worker_id);
   found->second->OnStopped();
 }
 
 void EmbeddedWorkerRegistry::OnSendMessageToBrowser(
     int embedded_worker_id, const IPC::Message& message) {
   WorkerInstanceMap::iterator found = worker_map_.find(embedded_worker_id);
   if (found == worker_map_.end()) {
     LOG(ERROR) << "Worker " << embedded_worker_id << " not registered";
     return;
   }
   // TODO(kinuko): Filter out unexpected messages here and uncomment below
   // when we actually define messages that are to be sent from child process
   // to the browser via this channel. (We don't have any yet)
   // found->second->OnMessageReceived(message);
 }
 
 void EmbeddedWorkerRegistry::AddChildProcessSender(
     int process_id, IPC::Sender* sender) {
   process_sender_map_[process_id] = sender;
   DCHECK(!ContainsKey(worker_process_map_, process_id));
 }
 
 void EmbeddedWorkerRegistry::RemoveChildProcessSender(int process_id) {
   process_sender_map_.erase(process_id);
-  std::map<int, int>::iterator found = worker_process_map_.find(process_id);
+  std::map<int, std::set<int> >::iterator found =
+      worker_process_map_.find(process_id);
   if (found != worker_process_map_.end()) {

[kinuko, 2014/02/04 03:37:53]

nit: let's assign worker_process_map_[process_id] to a temp variable before the
for loop

const std::set<int>& worker_set = worker_process_map_[process_id];

[alecflett, 2014/02/04 20:09:04]

Done.

-    int embedded_worker_id = found->second;
-    DCHECK(ContainsKey(worker_map_, embedded_worker_id));
-    worker_map_[embedded_worker_id]->OnStopped();
+    for (std::set<int>::const_iterator it =
+             worker_process_map_[process_id].begin();
+         it != worker_process_map_[process_id].end();
+         ++it) {
+      int embedded_worker_id = *it;
+      DCHECK(ContainsKey(worker_map_, embedded_worker_id));
+      worker_map_[embedded_worker_id]->OnStopped();
+    }
     worker_process_map_.erase(found);
   }
 }
 
 EmbeddedWorkerInstance* EmbeddedWorkerRegistry::GetWorker(
     int embedded_worker_id) {
   WorkerInstanceMap::iterator found = worker_map_.find(embedded_worker_id);
   if (found == worker_map_.end())
     return NULL;
   return found->second;
@@ skipping 14 matching lines @@
 }
 
 void EmbeddedWorkerRegistry::RemoveWorker(int process_id,
                                           int embedded_worker_id) {
   DCHECK(ContainsKey(worker_map_, embedded_worker_id));
   worker_map_.erase(embedded_worker_id);
   worker_process_map_.erase(process_id);
 }
 
 }  // namespace content