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

Unified Diff: content/renderer/service_worker/embedded_worker_dispatcher.cc

Issue 118103002: Add IPC stubs between browser and ServiceWorker's worker context in the child process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 11 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/renderer/service_worker/embedded_worker_dispatcher.cc
diff --git a/content/renderer/service_worker/embedded_worker_dispatcher.cc b/content/renderer/service_worker/embedded_worker_dispatcher.cc
index 0aa4ab2d82052bc86b49efd484942c8f2391d4c3..bbe72ab92b42a3495f07ae6c10c980843ab5a7fb 100644
--- a/content/renderer/service_worker/embedded_worker_dispatcher.cc
+++ b/content/renderer/service_worker/embedded_worker_dispatcher.cc
@@ -12,7 +12,7 @@
#include "content/child/thread_safe_sender.h"
#include "content/common/service_worker_messages.h"
#include "content/renderer/render_thread_impl.h"
-#include "content/renderer/service_worker/service_worker_context_client.h"
+#include "content/renderer/service_worker/embedded_worker_context_client.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/web/WebEmbeddedWorker.h"
@@ -44,8 +44,8 @@ bool EmbeddedWorkerDispatcher::OnMessageReceived(
const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerDispatcher, message)
- IPC_MESSAGE_HANDLER(ServiceWorkerMsg_StartWorker, OnStartWorker)
- IPC_MESSAGE_HANDLER(ServiceWorkerMsg_TerminateWorker, OnTerminateWorker)
+ IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StartWorker, OnStartWorker)
+ IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StopWorker, OnStopWorker)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
@@ -53,6 +53,8 @@ bool EmbeddedWorkerDispatcher::OnMessageReceived(
void EmbeddedWorkerDispatcher::WorkerContextDestroyed(
int embedded_worker_id) {
+ RenderThreadImpl::current()->thread_safe_sender()->Send(
+ new EmbeddedWorkerHostMsg_WorkerStopped(embedded_worker_id));
workers_.Remove(embedded_worker_id);
}
@@ -63,7 +65,7 @@ void EmbeddedWorkerDispatcher::OnStartWorker(
DCHECK(!workers_.Lookup(embedded_worker_id));
scoped_ptr<WorkerWrapper> wrapper(new WorkerWrapper(
blink::WebEmbeddedWorker::create(
- new ServiceWorkerContextClient(
+ new EmbeddedWorkerContextClient(
embedded_worker_id,
service_worker_version_id,
script_url),
@@ -78,10 +80,10 @@ void EmbeddedWorkerDispatcher::OnStartWorker(
workers_.AddWithID(wrapper.release(), embedded_worker_id);
}
-void EmbeddedWorkerDispatcher::OnTerminateWorker(int embedded_worker_id) {
+void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) {
WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
if (!wrapper) {
- LOG(WARNING) << "Got OnTerminateWorker for nonexistent worker";
+ LOG(WARNING) << "Got OnStopWorker for nonexistent worker";
return;
}

Powered by Google App Engine
This is Rietveld 408576698