Commit 8425e1f3 authored by vsevik's avatar vsevik Committed by Commit bot

DevTools: Use workerReadyForInspection event as a signal for DevTools attaching

BUG=404355
R=yurys, pfeldman-OOO, horo

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

Cr-Commit-Position: refs/heads/master@{#292387}
parent c1ae0872
...@@ -143,13 +143,6 @@ bool EmbeddedWorkerDevToolsAgentHost::OnMessageReceived( ...@@ -143,13 +143,6 @@ bool EmbeddedWorkerDevToolsAgentHost::OnMessageReceived(
} }
void EmbeddedWorkerDevToolsAgentHost::WorkerReadyForInspection() { void EmbeddedWorkerDevToolsAgentHost::WorkerReadyForInspection() {
// TODO(vsevik): This method will be implemented once we support connecting
// devtools to the main thread of embedded worker.
}
void EmbeddedWorkerDevToolsAgentHost::WorkerContextStarted() {
// TODO(vsevik): This code should be moved to WorkerReadyForInspection()
// once we support connecting devtools to the main thread of embedded worker.
if (state_ == WORKER_PAUSED_FOR_DEBUG_ON_START) { if (state_ == WORKER_PAUSED_FOR_DEBUG_ON_START) {
RenderProcessHost* rph = RenderProcessHost::FromID(worker_id_.first); RenderProcessHost* rph = RenderProcessHost::FromID(worker_id_.first);
Inspect(rph->GetBrowserContext()); Inspect(rph->GetBrowserContext());
...@@ -161,6 +154,9 @@ void EmbeddedWorkerDevToolsAgentHost::WorkerContextStarted() { ...@@ -161,6 +154,9 @@ void EmbeddedWorkerDevToolsAgentHost::WorkerContextStarted() {
} }
} }
void EmbeddedWorkerDevToolsAgentHost::WorkerContextStarted() {
}
void EmbeddedWorkerDevToolsAgentHost::WorkerRestarted(WorkerId worker_id) { void EmbeddedWorkerDevToolsAgentHost::WorkerRestarted(WorkerId worker_id) {
DCHECK_EQ(WORKER_TERMINATED, state_); DCHECK_EQ(WORKER_TERMINATED, state_);
state_ = IsAttached() ? WORKER_PAUSED_FOR_REATTACH : WORKER_UNINSPECTED; state_ = IsAttached() ? WORKER_PAUSED_FOR_REATTACH : WORKER_UNINSPECTED;
......
...@@ -113,7 +113,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, BasicTest) { ...@@ -113,7 +113,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, BasicTest) {
manager_->SharedWorkerCreated(1, 1, instance1); manager_->SharedWorkerCreated(1, 1, instance1);
CheckWorkerState(1, 1, WorkerState::WORKER_UNINSPECTED); CheckWorkerState(1, 1, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerReadyForInspection(1, 1); manager_->WorkerReadyForInspection(1, 1);
CheckWorkerState(1, 1, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerContextStarted(1, 1); manager_->WorkerContextStarted(1, 1);
CheckWorkerState(1, 1, WorkerState::WORKER_UNINSPECTED); CheckWorkerState(1, 1, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerDestroyed(1, 1); manager_->WorkerDestroyed(1, 1);
...@@ -128,7 +127,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, BasicTest) { ...@@ -128,7 +127,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, BasicTest) {
CheckWorkerState(1, 2, WorkerState::WORKER_UNINSPECTED); CheckWorkerState(1, 2, WorkerState::WORKER_UNINSPECTED);
EXPECT_EQ(agent_host.get(), manager_->GetDevToolsAgentHostForWorker(1, 2)); EXPECT_EQ(agent_host.get(), manager_->GetDevToolsAgentHostForWorker(1, 2));
manager_->WorkerReadyForInspection(1, 2); manager_->WorkerReadyForInspection(1, 2);
CheckWorkerState(1, 2, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerContextStarted(1, 2); manager_->WorkerContextStarted(1, 2);
CheckWorkerState(1, 2, WorkerState::WORKER_UNINSPECTED); CheckWorkerState(1, 2, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerDestroyed(1, 2); manager_->WorkerDestroyed(1, 2);
...@@ -141,7 +139,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, BasicTest) { ...@@ -141,7 +139,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, BasicTest) {
manager_->SharedWorkerCreated(1, 3, instance1); manager_->SharedWorkerCreated(1, 3, instance1);
CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED); CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerReadyForInspection(1, 3); manager_->WorkerReadyForInspection(1, 3);
CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerContextStarted(1, 3); manager_->WorkerContextStarted(1, 3);
CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED); CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED);
agent_host = manager_->GetDevToolsAgentHostForWorker(1, 3); agent_host = manager_->GetDevToolsAgentHostForWorker(1, 3);
...@@ -212,7 +209,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, AttachTest) { ...@@ -212,7 +209,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, AttachTest) {
client_host1->InspectAgentHost(agent_host1.get()); client_host1->InspectAgentHost(agent_host1.get());
CheckWorkerState(2, 1, WorkerState::WORKER_INSPECTED); CheckWorkerState(2, 1, WorkerState::WORKER_INSPECTED);
manager_->WorkerReadyForInspection(2, 1); manager_->WorkerReadyForInspection(2, 1);
CheckWorkerState(2, 1, WorkerState::WORKER_INSPECTED);
manager_->WorkerContextStarted(2, 1); manager_->WorkerContextStarted(2, 1);
CheckWorkerState(2, 1, WorkerState::WORKER_INSPECTED); CheckWorkerState(2, 1, WorkerState::WORKER_INSPECTED);
manager_->WorkerDestroyed(2, 1); manager_->WorkerDestroyed(2, 1);
...@@ -224,7 +220,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, AttachTest) { ...@@ -224,7 +220,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, AttachTest) {
manager_->SharedWorkerCreated(2, 2, instance2); manager_->SharedWorkerCreated(2, 2, instance2);
CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED); CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerReadyForInspection(2, 2); manager_->WorkerReadyForInspection(2, 2);
CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED);
manager_->WorkerContextStarted(2, 2); manager_->WorkerContextStarted(2, 2);
CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED); CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED);
agent_host2 = manager_->GetDevToolsAgentHostForWorker(2, 2); agent_host2 = manager_->GetDevToolsAgentHostForWorker(2, 2);
...@@ -245,7 +240,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, AttachTest) { ...@@ -245,7 +240,6 @@ TEST_F(EmbeddedWorkerDevToolsManagerTest, AttachTest) {
CheckWorkerState(2, 3, WorkerState::WORKER_PAUSED_FOR_REATTACH); CheckWorkerState(2, 3, WorkerState::WORKER_PAUSED_FOR_REATTACH);
EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 3)); EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 3));
manager_->WorkerReadyForInspection(2, 3); manager_->WorkerReadyForInspection(2, 3);
CheckWorkerState(2, 3, WorkerState::WORKER_PAUSED_FOR_REATTACH);
manager_->WorkerContextStarted(2, 3); manager_->WorkerContextStarted(2, 3);
CheckWorkerState(2, 3, WorkerState::WORKER_INSPECTED); CheckWorkerState(2, 3, WorkerState::WORKER_INSPECTED);
client_host1->InspectAgentHost(NULL); client_host1->InspectAgentHost(NULL);
......
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