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

Unified Diff: content/browser/service_worker/embedded_worker_registry.cc

Issue 489253002: Allow the browser to Send messages to an embedded worker once the script as been loaded without hav… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
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 e7e444159f99358e32350cdb1e83514dab25129a..393c876a61912a12a475f09e170bc5fb5d8f3ede 100644
--- a/content/browser/service_worker/embedded_worker_registry.cc
+++ b/content/browser/service_worker/embedded_worker_registry.cc
@@ -84,7 +84,8 @@ void EmbeddedWorkerRegistry::OnWorkerReadyForInspection(
}
void EmbeddedWorkerRegistry::OnWorkerScriptLoaded(int process_id,
- int embedded_worker_id) {
+ int thread_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";
@@ -94,7 +95,7 @@ void EmbeddedWorkerRegistry::OnWorkerScriptLoaded(int process_id,
LOG(ERROR) << "Incorrect embedded_worker_id";
return;
}
- found->second->OnScriptLoaded();
+ found->second->OnScriptLoaded(thread_id);
}
void EmbeddedWorkerRegistry::OnWorkerScriptLoadFailed(int process_id,
@@ -112,7 +113,7 @@ void EmbeddedWorkerRegistry::OnWorkerScriptLoadFailed(int process_id,
}
void EmbeddedWorkerRegistry::OnWorkerStarted(
- int process_id, int thread_id, int embedded_worker_id) {
+ int process_id, int embedded_worker_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);
@@ -125,11 +126,11 @@ void EmbeddedWorkerRegistry::OnWorkerStarted(
return;
}
worker_process_map_[process_id].insert(embedded_worker_id);
- found->second->OnStarted(thread_id);
+ found->second->OnStarted();
}
-void EmbeddedWorkerRegistry::OnWorkerStopped(
- int process_id, int embedded_worker_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";

Powered by Google App Engine
This is Rietveld 408576698