| 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 48%
|
| copy from content/child/shared_worker_devtools_agent.cc
|
| copy to content/renderer/service_worker/embedded_worker_devtools_agent.cc
|
| index 853d08e359df0c7266aaceeee69829574c58af8f..3e1c140dd43c6c3241af3922d4e015ae54b1bdcc 100644
|
| --- a/content/child/shared_worker_devtools_agent.cc
|
| +++ b/content/renderer/service_worker/embedded_worker_devtools_agent.cc
|
| @@ -2,33 +2,31 @@
|
| // 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 "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)
|
| + : webworker_(webworker) {
|
| }
|
|
|
| -SharedWorkerDevToolsAgent::~SharedWorkerDevToolsAgent() {
|
| +EmbeddedWorkerDevToolsAgent::~EmbeddedWorkerDevToolsAgent() {
|
| }
|
|
|
| -// 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_BEGIN_MESSAGE_MAP(EmbeddedWorkerDevToolsAgent, message)
|
| IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Attach, OnAttach)
|
| IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Reattach, OnReattach)
|
| IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Detach, OnDetach)
|
| @@ -41,42 +39,25 @@ bool SharedWorkerDevToolsAgent::OnMessageReceived(const IPC::Message& message) {
|
| 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
|
|
|