Commit bd519f33 authored by vsevik's avatar vsevik Committed by Commit bot

DevTools: Clean-up service/shared workers code after switching to main thread debugging.

BUG=404355

Review URL: https://codereview.chromium.org/661423002

Cr-Commit-Position: refs/heads/master@{#300428}
parent 1f89c007
......@@ -159,9 +159,6 @@ void EmbeddedWorkerDevToolsAgentHost::WorkerReadyForInspection() {
}
}
void EmbeddedWorkerDevToolsAgentHost::WorkerContextStarted() {
}
void EmbeddedWorkerDevToolsAgentHost::WorkerRestarted(WorkerId worker_id) {
DCHECK_EQ(WORKER_TERMINATED, state_);
state_ = IsAttached() ? WORKER_PAUSED_FOR_REATTACH : WORKER_UNINSPECTED;
......
......@@ -45,7 +45,6 @@ class EmbeddedWorkerDevToolsAgentHost : public IPCDevToolsAgentHost,
virtual bool OnMessageReceived(const IPC::Message& msg) override;
void WorkerReadyForInspection();
void WorkerContextStarted();
void WorkerRestarted(WorkerId worker_id);
void WorkerDestroyed();
bool Matches(const SharedWorkerInstance& other);
......
......@@ -151,15 +151,6 @@ void EmbeddedWorkerDevToolsManager::WorkerReadyForInspection(
it->second->WorkerReadyForInspection();
}
void EmbeddedWorkerDevToolsManager::WorkerContextStarted(int worker_process_id,
int worker_route_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
const WorkerId id(worker_process_id, worker_route_id);
AgentHostMap::iterator it = workers_.find(id);
DCHECK(it != workers_.end());
it->second->WorkerContextStarted();
}
void EmbeddedWorkerDevToolsManager::RemoveInspectedWorkerData(WorkerId id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
workers_.erase(id);
......
......@@ -74,7 +74,6 @@ class CONTENT_EXPORT EmbeddedWorkerDevToolsManager {
int worker_route_id,
const ServiceWorkerIdentifier& service_worker_id);
void WorkerReadyForInspection(int worker_process_id, int worker_route_id);
void WorkerContextStarted(int worker_process_id, int worker_route_id);
void WorkerDestroyed(int worker_process_id, int worker_route_id);
void set_debug_service_worker_on_start(bool debug_on_start) {
......
......@@ -114,8 +114,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, BasicTest) {
CheckWorkerState(1, 1, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerReadyForInspection(1, 1);
CheckWorkerState(1, 1, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerContextStarted(1, 1);
CheckWorkerState(1, 1, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerDestroyed(1, 1);
CheckWorkerNotExist(1, 1);
......@@ -129,8 +127,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, BasicTest) {
EXPECT_EQ(agent_host.get(), manager_->GetDevToolsAgentHostForWorker(1, 2));
manager_->WorkerReadyForInspection(1, 2);
CheckWorkerState(1, 2, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerContextStarted(1, 2);
CheckWorkerState(1, 2, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerDestroyed(1, 2);
CheckWorkerState(1, 2, WorkerState::WORKER_TERMINATED);
agent_host = NULL;
......@@ -142,8 +138,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, BasicTest) {
CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerReadyForInspection(1, 3);
CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerContextStarted(1, 3);
CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED);
agent_host = manager_->GetDevToolsAgentHostForWorker(1, 3);
EXPECT_TRUE(agent_host.get());
CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED);
......@@ -213,8 +207,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, AttachTest) {
CheckWorkerState(2, 1, WorkerState::WORKER_INSPECTED);
manager_->WorkerReadyForInspection(2, 1);
CheckWorkerState(2, 1, WorkerState::WORKER_INSPECTED);
manager_->WorkerContextStarted(2, 1);
CheckWorkerState(2, 1, WorkerState::WORKER_INSPECTED);
manager_->WorkerDestroyed(2, 1);
CheckWorkerState(2, 1, WorkerState::WORKER_TERMINATED);
EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 1));
......@@ -225,8 +217,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, AttachTest) {
CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerReadyForInspection(2, 2);
CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerContextStarted(2, 2);
CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED);
agent_host2 = manager_->GetDevToolsAgentHostForWorker(2, 2);
EXPECT_TRUE(agent_host2.get());
EXPECT_NE(agent_host1.get(), agent_host2.get());
......@@ -246,8 +236,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, AttachTest) {
EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 3));
manager_->WorkerReadyForInspection(2, 3);
CheckWorkerState(2, 3, WorkerState::WORKER_INSPECTED);
manager_->WorkerContextStarted(2, 3);
CheckWorkerState(2, 3, WorkerState::WORKER_INSPECTED);
client_host1->InspectAgentHost(NULL);
manager_->WorkerDestroyed(2, 3);
CheckWorkerState(2, 3, WorkerState::WORKER_TERMINATED);
......
......@@ -45,19 +45,6 @@ void NotifyWorkerReadyForInspection(int worker_process_id,
worker_process_id, worker_route_id);
}
void NotifyWorkerContextStarted(int worker_process_id, int worker_route_id) {
if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
BrowserThread::PostTask(
BrowserThread::UI,
FROM_HERE,
base::Bind(
NotifyWorkerContextStarted, worker_process_id, worker_route_id));
return;
}
EmbeddedWorkerDevToolsManager::GetInstance()->WorkerContextStarted(
worker_process_id, worker_route_id);
}
void NotifyWorkerDestroyed(int worker_process_id, int worker_route_id) {
if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
BrowserThread::PostTask(
......@@ -271,8 +258,6 @@ void EmbeddedWorkerInstance::OnReadyForInspection() {
void EmbeddedWorkerInstance::OnScriptLoaded(int thread_id) {
thread_id_ = thread_id;
if (worker_devtools_agent_route_id_ != MSG_ROUTING_NONE)
NotifyWorkerContextStarted(process_id_, worker_devtools_agent_route_id_);
}
void EmbeddedWorkerInstance::OnScriptLoadFailed() {
......
......@@ -45,19 +45,6 @@ void NotifyWorkerReadyForInspection(int worker_process_id,
worker_process_id, worker_route_id);
}
void NotifyWorkerContextStarted(int worker_process_id, int worker_route_id) {
if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
BrowserThread::PostTask(
BrowserThread::UI,
FROM_HERE,
base::Bind(
NotifyWorkerContextStarted, worker_process_id, worker_route_id));
return;
}
EmbeddedWorkerDevToolsManager::GetInstance()->WorkerContextStarted(
worker_process_id, worker_route_id);
}
void NotifyWorkerDestroyed(int worker_process_id, int worker_route_id) {
if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
BrowserThread::PostTask(
......@@ -196,7 +183,6 @@ void SharedWorkerHost::WorkerReadyForInspection() {
void SharedWorkerHost::WorkerScriptLoaded() {
UMA_HISTOGRAM_TIMES("SharedWorker.TimeToScriptLoaded",
base::TimeTicks::Now() - creation_time_);
NotifyWorkerContextStarted(worker_process_id_, worker_route_id_);
}
void SharedWorkerHost::WorkerScriptLoadFailed() {
......
......@@ -38,8 +38,6 @@ bool SharedWorkerDevToolsAgent::OnMessageReceived(const IPC::Message& message) {
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;
......@@ -87,10 +85,6 @@ void SharedWorkerDevToolsAgent::OnDispatchOnInspectorBackend(
webworker_->dispatchDevToolsMessage(WebString::fromUTF8(message));
}
void SharedWorkerDevToolsAgent::OnResumeWorkerContext() {
webworker_->resumeWorkerContext();
}
bool SharedWorkerDevToolsAgent::Send(IPC::Message* message) {
return ChildThread::current()->Send(message);
}
......
......@@ -35,7 +35,6 @@ class SharedWorkerDevToolsAgent {
void OnReattach(const std::string& host_id, const std::string& state);
void OnDetach();
void OnDispatchOnInspectorBackend(const std::string& message);
void OnResumeWorkerContext();
bool Send(IPC::Message* message);
const int route_id_;
......
......@@ -94,9 +94,6 @@ IPC_MESSAGE_ROUTED2(DevToolsAgentMsg_AddMessageToConsole,
content::ConsoleMessageLevel /* level */,
std::string /* message */)
// Worker DevTools agent should resume worker execution.
IPC_MESSAGE_ROUTED0(DevToolsAgentMsg_ResumeWorkerContext)
//-----------------------------------------------------------------------------
// These are messages sent from the browser to the renderer.
......
......@@ -36,8 +36,6 @@ bool EmbeddedWorkerDevToolsAgent::OnMessageReceived(
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;
......@@ -62,8 +60,4 @@ void EmbeddedWorkerDevToolsAgent::OnDispatchOnInspectorBackend(
webworker_->dispatchDevToolsMessage(WebString::fromUTF8(message));
}
void EmbeddedWorkerDevToolsAgent::OnResumeWorkerContext() {
webworker_->resumeWorkerContext();
}
} // namespace content
......@@ -34,7 +34,6 @@ class EmbeddedWorkerDevToolsAgent : public IPC::Listener {
void OnReattach(const std::string& host_id, const std::string& state);
void OnDetach();
void OnDispatchOnInspectorBackend(const std::string& message);
void OnResumeWorkerContext();
blink::WebEmbeddedWorker* webworker_;
int route_id_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment