Commit d72c6ea2 authored by Patrick Monette's avatar Patrick Monette Committed by Commit Bot

Revert "[PM] Connect dedicated workers to their client frames in the graph."

This reverts commit 8e70db4d.

Reason for revert: Made a test flaky

Original change's description:
> [PM] Connect dedicated workers to their client frames in the graph.
> 
> Bug: 993029
> Change-Id: Iae20fa0ede4421782fc5fbf2851d21c83cfbf4c8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2095452
> Commit-Queue: Patrick Monette <pmonette@chromium.org>
> Reviewed-by: Sigurður Ásgeirsson <siggi@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#753319}

TBR=pmonette@chromium.org,siggi@chromium.org

Change-Id: Ibb2d0ad5ed6e5d35be052e0324fcbf7954219070
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 993029, 1064772
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2122248Reviewed-by: default avatarPatrick Monette <pmonette@chromium.org>
Commit-Queue: Patrick Monette <pmonette@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753622}
parent 14f4f84a
...@@ -128,11 +128,12 @@ void WorkerWatcher::OnWorkerStarted( ...@@ -128,11 +128,12 @@ void WorkerWatcher::OnWorkerStarted(
browser_context_id_, WorkerNode::WorkerType::kDedicated, browser_context_id_, WorkerNode::WorkerType::kDedicated,
process_node_source_->GetProcessNode(worker_process_id), process_node_source_->GetProcessNode(worker_process_id),
base::UnguessableToken::Create()); base::UnguessableToken::Create());
AddClientFrame(worker_node.get(), ancestor_render_frame_host_id);
bool inserted = dedicated_worker_nodes_ bool inserted = dedicated_worker_nodes_
.emplace(dedicated_worker_id, std::move(worker_node)) .emplace(dedicated_worker_id, std::move(worker_node))
.second; .second;
DCHECK(inserted); DCHECK(inserted);
// TODO(pmonette): Connect |worker_node| to its client frame.
} }
void WorkerWatcher::OnBeforeWorkerTerminated( void WorkerWatcher::OnBeforeWorkerTerminated(
...@@ -140,15 +141,15 @@ void WorkerWatcher::OnBeforeWorkerTerminated( ...@@ -140,15 +141,15 @@ void WorkerWatcher::OnBeforeWorkerTerminated(
content::GlobalFrameRoutingId ancestor_render_frame_host_id) { content::GlobalFrameRoutingId ancestor_render_frame_host_id) {
auto it = dedicated_worker_nodes_.find(dedicated_worker_id); auto it = dedicated_worker_nodes_.find(dedicated_worker_id);
DCHECK(it != dedicated_worker_nodes_.end()); DCHECK(it != dedicated_worker_nodes_.end());
auto worker_node = std::move(it->second);
dedicated_worker_nodes_.erase(it);
RemoveClientFrame(worker_node.get(), ancestor_render_frame_host_id); auto worker_node = std::move(it->second);
// TODO(pmonette): Disconnect |worker_node| from its client frame.
#if DCHECK_IS_ON() #if DCHECK_IS_ON()
DCHECK(!base::Contains(clients_to_remove_, worker_node.get())); DCHECK(!base::Contains(clients_to_remove_, worker_node.get()));
#endif // DCHECK_IS_ON() #endif // DCHECK_IS_ON()
PerformanceManagerImpl::DeleteNode(std::move(worker_node)); PerformanceManagerImpl::DeleteNode(std::move(worker_node));
dedicated_worker_nodes_.erase(it);
} }
void WorkerWatcher::OnFinalResponseURLDetermined( void WorkerWatcher::OnFinalResponseURLDetermined(
......
...@@ -587,7 +587,9 @@ TEST_F(WorkerWatcherTest, SimpleDedicatedWorker) { ...@@ -587,7 +587,9 @@ TEST_F(WorkerWatcherTest, SimpleDedicatedWorker) {
EXPECT_EQ(worker_node->worker_type(), EXPECT_EQ(worker_node->worker_type(),
WorkerNode::WorkerType::kDedicated); WorkerNode::WorkerType::kDedicated);
EXPECT_EQ(worker_node->process_node(), process_node); EXPECT_EQ(worker_node->process_node(), process_node);
EXPECT_TRUE(IsWorkerClient(worker_node, client_frame_node)); // TODO(pmonette): Change the following to EXPECT_TRUE when the
// dedicated worker node gets hooked up correctly.
EXPECT_FALSE(IsWorkerClient(worker_node, client_frame_node));
})); }));
// Disconnect and clean up the worker. // Disconnect and clean up the worker.
...@@ -792,7 +794,9 @@ TEST_F(WorkerWatcherTest, FrameDestroyed) { ...@@ -792,7 +794,9 @@ TEST_F(WorkerWatcherTest, FrameDestroyed) {
render_frame_host_id)](GraphImpl* graph) { render_frame_host_id)](GraphImpl* graph) {
EXPECT_TRUE(graph->NodeInGraph(dedicated_worker_node)); EXPECT_TRUE(graph->NodeInGraph(dedicated_worker_node));
EXPECT_TRUE(graph->NodeInGraph(shared_worker_node)); EXPECT_TRUE(graph->NodeInGraph(shared_worker_node));
EXPECT_TRUE(IsWorkerClient(dedicated_worker_node, client_frame_node)); // TODO(pmonette): Change the following to EXPECT_TRUE when the
// dedicated worker node gets hooked up correctly.
EXPECT_FALSE(IsWorkerClient(dedicated_worker_node, client_frame_node));
EXPECT_TRUE(IsWorkerClient(shared_worker_node, client_frame_node)); EXPECT_TRUE(IsWorkerClient(shared_worker_node, client_frame_node));
})); }));
......
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