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

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

Issue 697593002: ServiceWorker: Registering a malformed script should fail [2/3] (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix comment Created 6 years, 1 month 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 15ca3b1c2fe5cc94e3246331626318d60ed82161..cb2641d7cca88b86a4a4f32e8566c328955ce7fa 100644
--- a/content/browser/service_worker/embedded_worker_registry.cc
+++ b/content/browser/service_worker/embedded_worker_registry.cc
@@ -100,6 +100,17 @@ void EmbeddedWorkerRegistry::OnWorkerScriptLoadFailed(int process_id,
found->second->OnScriptLoadFailed();
}
+void EmbeddedWorkerRegistry::OnWorkerScriptEvaluated(int process_id,
+ int embedded_worker_id,
+ bool success) {
+ WorkerInstanceMap::iterator found = worker_map_.find(embedded_worker_id);
+ DCHECK(found != worker_map_.end());
+ DCHECK_EQ(found->second->process_id(), process_id);
+ if (found == worker_map_.end() || found->second->process_id() != process_id)
+ return;
+ found->second->OnScriptEvaluated(success);
+}
+
void EmbeddedWorkerRegistry::OnWorkerStarted(
int process_id, int embedded_worker_id) {
DCHECK(!ContainsKey(worker_process_map_, process_id) ||
@@ -214,15 +225,14 @@ EmbeddedWorkerRegistry::~EmbeddedWorkerRegistry() {
Shutdown();
}
-void EmbeddedWorkerRegistry::SendStartWorker(
+ServiceWorkerStatusCode EmbeddedWorkerRegistry::SendStartWorker(
scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params,
- const StatusCallback& callback,
int process_id) {
// The ServiceWorkerDispatcherHost is supposed to be created when the process
// is created, and keep an entry in process_sender_map_ for its whole
// lifetime.
DCHECK(ContainsKey(process_sender_map_, process_id));
- callback.Run(Send(process_id, new EmbeddedWorkerMsg_StartWorker(*params)));
+ return Send(process_id, new EmbeddedWorkerMsg_StartWorker(*params));
}
ServiceWorkerStatusCode EmbeddedWorkerRegistry::Send(

Powered by Google App Engine
This is Rietveld 408576698