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 "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 {

[kinuko, 2014/04/28 07:25:56]

Now that it also handles messages the comment and class name is probably a bit
stale/misnomer.  It could be renamed to, say, EmbeddedWorkerStub, or we could
have a separate class for DevTools related messages, like,
EmbeddedWorkerDevToolsDispatcher, and this class can just have a pointer
(scoped_ptr) to it.  (In either case I think it's nicer to have it in a separate
file)

[horo, 2014/04/28 08:33:09]

Done.
Added EmbeddedWorkerDevToolsAgent.

  public:
   explicit WorkerWrapper(blink::WebEmbeddedWorker* worker) : worker_(worker) {}
   ~WorkerWrapper() {}
 
   blink::WebEmbeddedWorker* worker() { return worker_.get(); }
+  void OnMessageReceived(const IPC::Message& message);
 
  private:
+  void OnAttachDevTools();
+  void OnReattachDevTools(const std::string& state);
+  void OnDetachDevTools();
+  void OnDispatchOnInspectorBackend(const std::string& message);
+  void OnResumeWorkerContext();
+
   ScopedChildProcessReference process_ref_;
   scoped_ptr<blink::WebEmbeddedWorker> worker_;
 };
 
+void EmbeddedWorkerDispatcher::WorkerWrapper::OnMessageReceived(
+    const IPC::Message& message) {
+  IPC_BEGIN_MESSAGE_MAP(WorkerWrapper, message)
+  IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Attach, OnAttachDevTools)
+  IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Reattach, OnReattachDevTools)
+  IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Detach, OnDetachDevTools)
+  IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DispatchOnInspectorBackend,
+                      OnDispatchOnInspectorBackend)
+  IPC_MESSAGE_HANDLER(DevToolsAgentMsg_ResumeWorkerContext,
+                      OnResumeWorkerContext)
+  IPC_END_MESSAGE_MAP()
+}
+
+void EmbeddedWorkerDispatcher::WorkerWrapper::OnAttachDevTools() {
+  worker_->attachDevTools();
+}
+
+void EmbeddedWorkerDispatcher::WorkerWrapper::OnReattachDevTools(
+    const std::string& state) {
+  worker_->reattachDevTools(blink::WebString::fromUTF8(state));
+}
+
+void EmbeddedWorkerDispatcher::WorkerWrapper::OnDetachDevTools() {
+  worker_->detachDevTools();
+}
+
+void EmbeddedWorkerDispatcher::WorkerWrapper::OnDispatchOnInspectorBackend(
+    const std::string& message) {
+  worker_->dispatchDevToolsMessage(blink::WebString::fromUTF8(message));
+}
+
+void EmbeddedWorkerDispatcher::WorkerWrapper::OnResumeWorkerContext() {
+  worker_->resumeWorkerContext();
+}
+
 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_MessageToWorker,
+                        OnMessageToWorker)
     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);
@@ skipping 28 matching lines @@
     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::OnMessageToWorker(
+    int embedded_worker_id,
+    const IPC::Message& message) {
+  WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id);
+  if (!wrapper) {
+    LOG(WARNING) << "Got OnMessageToWorker for nonexistent worker";
+    return;
+  }
+  wrapper->OnMessageReceived(message);
+}
+
 }  // namespace content