| 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 82a3d339cb806ed733d9d21d139733708cf7ed02..b711cf6370eb76974e4c231c8221ef16bb1f2b1b 100644
|
| --- a/content/renderer/service_worker/embedded_worker_dispatcher.cc
|
| +++ b/content/renderer/service_worker/embedded_worker_dispatcher.cc
|
| @@ -11,10 +11,12 @@
|
| #include "content/child/scoped_child_process_reference.h"
|
| #include "content/child/thread_safe_sender.h"
|
| #include "content/child/worker_task_runner.h"
|
| +#include "content/common/devtools_messages.h"
|
| #include "content/common/service_worker/embedded_worker_messages.h"
|
| #include "content/public/common/content_client.h"
|
| #include "content/renderer/render_thread_impl.h"
|
| #include "content/renderer/service_worker/embedded_worker_context_client.h"
|
| +#include "content/renderer/service_worker/embedded_worker_devtools_agent.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"
|
| @@ -26,14 +28,20 @@ namespace content {
|
| // references automatically.
|
| class EmbeddedWorkerDispatcher::WorkerWrapper {
|
| public:
|
| - explicit WorkerWrapper(blink::WebEmbeddedWorker* worker) : worker_(worker) {}
|
| + explicit WorkerWrapper(blink::WebEmbeddedWorker* worker)
|
| + : worker_(worker),
|
| + dev_tools_agent_(new EmbeddedWorkerDevToolsAgent(worker)) {}
|
| ~WorkerWrapper() {}
|
|
|
| blink::WebEmbeddedWorker* worker() { return worker_.get(); }
|
| + EmbeddedWorkerDevToolsAgent* dev_tools_agent() {
|
| + return dev_tools_agent_.get();
|
| + }
|
|
|
| private:
|
| ScopedChildProcessReference process_ref_;
|
| scoped_ptr<blink::WebEmbeddedWorker> worker_;
|
| + scoped_ptr<EmbeddedWorkerDevToolsAgent> dev_tools_agent_;
|
| };
|
|
|
| EmbeddedWorkerDispatcher::EmbeddedWorkerDispatcher() : weak_factory_(this) {}
|
| @@ -46,6 +54,8 @@ bool EmbeddedWorkerDispatcher::OnMessageReceived(
|
| IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerDispatcher, message)
|
| IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StartWorker, OnStartWorker)
|
| IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StopWorker, OnStopWorker)
|
| + IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_MessageToDevToolsAgent,
|
| + OnMessageToDevToolsAgent)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
| @@ -63,13 +73,12 @@ void EmbeddedWorkerDispatcher::OnStartWorker(int embedded_worker_id,
|
| const GURL& service_worker_scope,
|
| const GURL& script_url) {
|
| DCHECK(!workers_.Lookup(embedded_worker_id));
|
| - scoped_ptr<WorkerWrapper> wrapper(new WorkerWrapper(
|
| - blink::WebEmbeddedWorker::create(
|
| - new EmbeddedWorkerContextClient(
|
| - embedded_worker_id,
|
| - service_worker_version_id,
|
| - service_worker_scope,
|
| - script_url),
|
| + scoped_ptr<WorkerWrapper> wrapper(
|
| + new WorkerWrapper(blink::WebEmbeddedWorker::create(
|
| + new EmbeddedWorkerContextClient(embedded_worker_id,
|
| + service_worker_version_id,
|
| + service_worker_scope,
|
| + script_url),
|
| NULL)));
|
|
|
| blink::WebEmbeddedWorkerStartData start_data;
|
| @@ -94,4 +103,16 @@ void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) {
|
| wrapper->worker()->terminateWorkerContext();
|
| }
|
|
|
| +void EmbeddedWorkerDispatcher::OnMessageToDevToolsAgent(
|
| + int embedded_worker_id,
|
| + const IPC::Message& message) {
|
| + WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
|
| + if (!wrapper) {
|
| + LOG(WARNING) << "Got OnMessageToDevToolsAgent for nonexistent worker";
|
| + return;
|
| + }
|
| + const bool handled = wrapper->dev_tools_agent()->OnMessageReceived(message);
|
| + DCHECK(handled);
|
| +}
|
| +
|
| } // namespace content
|
|
|