Index: content/renderer/service_worker/embedded_worker_devtools_agent.cc |
diff --git a/content/child/shared_worker_devtools_agent.cc b/content/renderer/service_worker/embedded_worker_devtools_agent.cc |
similarity index 30% |
copy from content/child/shared_worker_devtools_agent.cc |
copy to content/renderer/service_worker/embedded_worker_devtools_agent.cc |
index 853d08e359df0c7266aaceeee69829574c58af8f..21db9d5153dc220e56ad0f53840dafe6fbed3011 100644 |
--- a/content/child/shared_worker_devtools_agent.cc |
+++ b/content/renderer/service_worker/embedded_worker_devtools_agent.cc |
@@ -2,81 +2,66 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "content/child/shared_worker_devtools_agent.h" |
+#include "content/renderer/service_worker/embedded_worker_devtools_agent.h" |
#include "content/child/child_thread.h" |
#include "content/common/devtools_messages.h" |
+#include "content/renderer/render_thread_impl.h" |
#include "third_party/WebKit/public/platform/WebCString.h" |
#include "third_party/WebKit/public/platform/WebString.h" |
-#include "third_party/WebKit/public/web/WebSharedWorker.h" |
+#include "third_party/WebKit/public/web/WebEmbeddedWorker.h" |
-using blink::WebSharedWorker; |
+using blink::WebEmbeddedWorker; |
using blink::WebString; |
namespace content { |
-SharedWorkerDevToolsAgent::SharedWorkerDevToolsAgent( |
- int route_id, |
- WebSharedWorker* webworker) |
- : route_id_(route_id), |
- webworker_(webworker) { |
+EmbeddedWorkerDevToolsAgent::EmbeddedWorkerDevToolsAgent( |
+ blink::WebEmbeddedWorker* webworker, |
+ int route_id) |
+ : webworker_(webworker), route_id_(route_id) { |
+ RenderThreadImpl::current()->AddEmbeddedWorkerRoute(route_id_, this); |
} |
-SharedWorkerDevToolsAgent::~SharedWorkerDevToolsAgent() { |
+EmbeddedWorkerDevToolsAgent::~EmbeddedWorkerDevToolsAgent() { |
+ RenderThreadImpl::current()->RemoveEmbeddedWorkerRoute(route_id_); |
} |
-// Called on the Worker thread. |
-bool SharedWorkerDevToolsAgent::OnMessageReceived(const IPC::Message& message) { |
+bool EmbeddedWorkerDevToolsAgent::OnMessageReceived( |
+ const IPC::Message& message) { |
bool handled = true; |
- IPC_BEGIN_MESSAGE_MAP(SharedWorkerDevToolsAgent, message) |
- IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Attach, OnAttach) |
- IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Reattach, OnReattach) |
- IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Detach, OnDetach) |
- IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DispatchOnInspectorBackend, |
- OnDispatchOnInspectorBackend) |
- IPC_MESSAGE_HANDLER(DevToolsAgentMsg_ResumeWorkerContext, |
- OnResumeWorkerContext) |
- IPC_MESSAGE_UNHANDLED(handled = false) |
+ IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerDevToolsAgent, message) |
+ IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Attach, OnAttach) |
+ IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Reattach, OnReattach) |
+ IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Detach, OnDetach) |
+ IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DispatchOnInspectorBackend, |
+ OnDispatchOnInspectorBackend) |
+ IPC_MESSAGE_HANDLER(DevToolsAgentMsg_ResumeWorkerContext, |
+ OnResumeWorkerContext) |
+ IPC_MESSAGE_UNHANDLED(handled = false) |
IPC_END_MESSAGE_MAP() |
return handled; |
} |
-void SharedWorkerDevToolsAgent::SendDevToolsMessage( |
- const blink::WebString& message) { |
- Send(new DevToolsClientMsg_DispatchOnInspectorFrontend( |
- route_id_, |
- message.utf8())); |
-} |
- |
-void SharedWorkerDevToolsAgent::SaveDevToolsAgentState( |
- const blink::WebString& state) { |
- Send(new DevToolsHostMsg_SaveAgentRuntimeState(route_id_, |
- state.utf8())); |
-} |
- |
-void SharedWorkerDevToolsAgent::OnAttach() { |
+void EmbeddedWorkerDevToolsAgent::OnAttach() { |
webworker_->attachDevTools(); |
} |
-void SharedWorkerDevToolsAgent::OnReattach(const std::string& state) { |
+void EmbeddedWorkerDevToolsAgent::OnReattach(const std::string& state) { |
webworker_->reattachDevTools(WebString::fromUTF8(state)); |
} |
-void SharedWorkerDevToolsAgent::OnDetach() { |
+void EmbeddedWorkerDevToolsAgent::OnDetach() { |
webworker_->detachDevTools(); |
} |
-void SharedWorkerDevToolsAgent::OnDispatchOnInspectorBackend( |
+void EmbeddedWorkerDevToolsAgent::OnDispatchOnInspectorBackend( |
const std::string& message) { |
webworker_->dispatchDevToolsMessage(WebString::fromUTF8(message)); |
} |
-void SharedWorkerDevToolsAgent::OnResumeWorkerContext() { |
+void EmbeddedWorkerDevToolsAgent::OnResumeWorkerContext() { |
webworker_->resumeWorkerContext(); |
} |
-bool SharedWorkerDevToolsAgent::Send(IPC::Message* message) { |
- return ChildThread::current()->Send(message); |
-} |
- |
} // namespace content |