Introduce EmbeddedWorkerDevToolsAgent.

content/renderer/service_worker/embedded_worker_dispatcher.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/renderer/service_worker/embedded_worker_dispatcher.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/child_process.h"
 #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"
 #include "third_party/WebKit/public/web/WebEmbeddedWorkerStartData.h"
 
 namespace content {
 
 // A thin wrapper of WebEmbeddedWorker which also adds and releases process
 // 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(); }
+  void OnMessageToDevToolsAgent(const IPC::Message& message);

[kinuko, 2014/04/29 01:16:09]

nit: this can just expose dev_tools_agent() field and we can call its
OnMessageReceived directly in
EmbeddedWorkerDispatcher::OnMessageToDevToolsAgent.

[horo, 2014/04/29 06:13:46]

Done.

 
  private:
   ScopedChildProcessReference process_ref_;
   scoped_ptr<blink::WebEmbeddedWorker> worker_;
+  scoped_ptr<EmbeddedWorkerDevToolsAgent> dev_tools_agent_;
 };
 
+void EmbeddedWorkerDispatcher::WorkerWrapper::OnMessageToDevToolsAgent(
+    const IPC::Message& message) {
+  dev_tools_agent_->OnMessageReceived(message);

[kinuko, 2014/04/29 01:16:09]

maybe DCHECK the return value (to see if it returns true)

[horo, 2014/04/29 06:13:46]

Done in EmbeddedWorkerDispatcher::OnMessageToDevToolsAgent.

+}
+
 EmbeddedWorkerDispatcher::EmbeddedWorkerDispatcher() : weak_factory_(this) {}
 
 EmbeddedWorkerDispatcher::~EmbeddedWorkerDispatcher() {}
 
 bool EmbeddedWorkerDispatcher::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   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;
 }
 
 void EmbeddedWorkerDispatcher::WorkerContextDestroyed(
     int embedded_worker_id) {
   RenderThreadImpl::current()->thread_safe_sender()->Send(
       new EmbeddedWorkerHostMsg_WorkerStopped(embedded_worker_id));
   workers_.Remove(embedded_worker_id);
 }
 
 void EmbeddedWorkerDispatcher::OnStartWorker(int embedded_worker_id,
                                              int64 service_worker_version_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;
   start_data.scriptURL = script_url;
   start_data.userAgent = base::UTF8ToUTF16(GetContentClient()->GetUserAgent());
   start_data.startMode = blink::WebEmbeddedWorkerStartModeDontPauseOnStart;
 
   wrapper->worker()->startWorkerContext(start_data);
   workers_.AddWithID(wrapper.release(), embedded_worker_id);
 }
 
 void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) {
   WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
   if (!wrapper) {
     LOG(WARNING) << "Got OnStopWorker for nonexistent worker";
     return;
   }
 
   // This should eventually call WorkerContextDestroyed. (We may need to post
   // a delayed task to forcibly abort the worker context if we find it
   // necessary)
   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;
+  }
+  wrapper->OnMessageToDevToolsAgent(message);
+}
+
 }  // namespace content