[PM] Remove superfluous property accessors (10/N)
This CL removes:
ProcessNodeImpl::GetRenderProcessId()
ProcessNodeImpl::GetPageNodeIfExclusive()
ProcessNodeImpl::metrics_name()
ProcessNodeImpl::main_thread_task_load_is_low()
ProcessNodeImpl::render_process_host_proxy()
ProcessNodeImpl::browser_child_process_host_proxy()
ProcessNodeImpl::priority()
ProcessNodeImpl::hosted_content_types()
Bug: 1497778
Change-Id: I4f872991d88a5a2b372a0dabbb9f7e7597560418
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5038361
Reviewed-by: Joe Mason <joenotcharles@google.com>
Commit-Queue: Patrick Monette <pmonette@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1226596}
diff --git a/components/performance_manager/decorators/page_load_tracker_decorator.cc b/components/performance_manager/decorators/page_load_tracker_decorator.cc
index 749739b..a408640 100644
--- a/components/performance_manager/decorators/page_load_tracker_decorator.cc
+++ b/components/performance_manager/decorators/page_load_tracker_decorator.cc
@@ -373,7 +373,7 @@
// of session restore this is mitigated by having a timeout while waiting for
// this signal.
return main_frame_node->GetNetworkAlmostIdle() &&
- process_node->main_thread_task_load_is_low();
+ process_node->GetMainThreadTaskLoadIsLow();
}
// static
diff --git a/components/performance_manager/decorators/process_hosted_content_types_aggregator_unittest.cc b/components/performance_manager/decorators/process_hosted_content_types_aggregator_unittest.cc
index a3ca761..08188f1 100644
--- a/components/performance_manager/decorators/process_hosted_content_types_aggregator_unittest.cc
+++ b/components/performance_manager/decorators/process_hosted_content_types_aggregator_unittest.cc
@@ -28,7 +28,7 @@
bool IsHosting(const TestNodeWrapper<ProcessNodeImpl>& process_node,
ContentType content_type) {
- return process_node->hosted_content_types().Has(content_type);
+ return process_node->GetHostedContentTypes().Has(content_type);
}
};
@@ -90,7 +90,7 @@
// Create a main frame in a first process.
auto process_node_1 = CreateNode<ProcessNodeImpl>();
- EXPECT_TRUE(process_node_1->hosted_content_types().Empty());
+ EXPECT_TRUE(process_node_1->GetHostedContentTypes().Empty());
auto main_frame_node =
CreateFrameNodeAutoId(process_node_1.get(), page_node.get());
@@ -103,7 +103,7 @@
// Create a child frame node in another process.
auto process_node_2 = CreateNode<ProcessNodeImpl>();
- EXPECT_TRUE(process_node_2->hosted_content_types().Empty());
+ EXPECT_TRUE(process_node_2->GetHostedContentTypes().Empty());
auto child_frame_node = CreateFrameNodeAutoId(
process_node_2.get(), page_node.get(), main_frame_node.get());
diff --git a/components/performance_manager/decorators/process_priority_aggregator.cc b/components/performance_manager/decorators/process_priority_aggregator.cc
index 5b9aa22..0d11409 100644
--- a/components/performance_manager/decorators/process_priority_aggregator.cc
+++ b/components/performance_manager/decorators/process_priority_aggregator.cc
@@ -168,7 +168,7 @@
DCHECK(!DataImpl::Get(process_node_impl));
DataImpl* data = DataImpl::GetOrCreate(process_node_impl);
DCHECK(data->IsEmpty());
- DCHECK_EQ(base::TaskPriority::LOWEST, process_node_impl->priority());
+ DCHECK_EQ(base::TaskPriority::LOWEST, process_node_impl->GetPriority());
DCHECK_EQ(base::TaskPriority::LOWEST, data->GetPriority());
}
diff --git a/components/performance_manager/decorators/process_priority_aggregator_unittest.cc b/components/performance_manager/decorators/process_priority_aggregator_unittest.cc
index dae6545..a6e1c76a 100644
--- a/components/performance_manager/decorators/process_priority_aggregator_unittest.cc
+++ b/components/performance_manager/decorators/process_priority_aggregator_unittest.cc
@@ -66,24 +66,24 @@
auto& worker1 = mock_graph.worker;
auto& worker2 = mock_graph.other_worker;
- EXPECT_EQ(base::TaskPriority::LOWEST, proc1->priority());
- EXPECT_EQ(base::TaskPriority::LOWEST, proc2->priority());
+ EXPECT_EQ(base::TaskPriority::LOWEST, proc1->GetPriority());
+ EXPECT_EQ(base::TaskPriority::LOWEST, proc2->GetPriority());
ExpectPriorityCounts(proc1.get(), 0, 0);
ExpectPriorityCounts(proc2.get(), 0, 0);
// Set the priority of a frame in process 1 to USER_VISIBLE.
frame1_1->SetPriorityAndReason(
PriorityAndReason(base::TaskPriority::USER_VISIBLE, kReason));
- EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc1->priority());
- EXPECT_EQ(base::TaskPriority::LOWEST, proc2->priority());
+ EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc1->GetPriority());
+ EXPECT_EQ(base::TaskPriority::LOWEST, proc2->GetPriority());
ExpectPriorityCounts(proc1.get(), 1, 0);
ExpectPriorityCounts(proc2.get(), 0, 0);
// Set the priority of a frame in process 2 to USER_VISIBLE.
frame2_1->SetPriorityAndReason(
PriorityAndReason(base::TaskPriority::USER_VISIBLE, kReason));
- EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc1->priority());
- EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc2->priority());
+ EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc1->GetPriority());
+ EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc2->GetPriority());
ExpectPriorityCounts(proc1.get(), 1, 0);
ExpectPriorityCounts(proc2.get(), 1, 0);
@@ -91,8 +91,8 @@
// overwrites the vote from the first frame.
frame1_2->SetPriorityAndReason(
PriorityAndReason(base::TaskPriority::USER_BLOCKING, kReason));
- EXPECT_EQ(base::TaskPriority::USER_BLOCKING, proc1->priority());
- EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc2->priority());
+ EXPECT_EQ(base::TaskPriority::USER_BLOCKING, proc1->GetPriority());
+ EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc2->GetPriority());
ExpectPriorityCounts(proc1.get(), 1, 1);
ExpectPriorityCounts(proc2.get(), 1, 0);
@@ -100,8 +100,8 @@
// the vote from the sole frame in this process.
worker2->SetPriorityAndReason(
PriorityAndReason(base::TaskPriority::USER_BLOCKING, kReason));
- EXPECT_EQ(base::TaskPriority::USER_BLOCKING, proc1->priority());
- EXPECT_EQ(base::TaskPriority::USER_BLOCKING, proc2->priority());
+ EXPECT_EQ(base::TaskPriority::USER_BLOCKING, proc1->GetPriority());
+ EXPECT_EQ(base::TaskPriority::USER_BLOCKING, proc2->GetPriority());
ExpectPriorityCounts(proc1.get(), 1, 1);
ExpectPriorityCounts(proc2.get(), 1, 1);
@@ -109,8 +109,8 @@
// both frames in this process are at USER_VISIBLE.
frame1_2->SetPriorityAndReason(
PriorityAndReason(base::TaskPriority::USER_VISIBLE, kReason));
- EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc1->priority());
- EXPECT_EQ(base::TaskPriority::USER_BLOCKING, proc2->priority());
+ EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc1->GetPriority());
+ EXPECT_EQ(base::TaskPriority::USER_BLOCKING, proc2->GetPriority());
ExpectPriorityCounts(proc1.get(), 2, 0);
ExpectPriorityCounts(proc2.get(), 1, 1);
@@ -118,8 +118,8 @@
// execution context priority of that process is now due to the sole frame.
worker2->SetPriorityAndReason(
PriorityAndReason(base::TaskPriority::LOWEST, kReason));
- EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc1->priority());
- EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc2->priority());
+ EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc1->GetPriority());
+ EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc2->GetPriority());
ExpectPriorityCounts(proc1.get(), 2, 0);
ExpectPriorityCounts(proc2.get(), 1, 0);
@@ -127,8 +127,8 @@
// execution contexts in this process are now at LOWEST.
frame2_1->SetPriorityAndReason(
PriorityAndReason(base::TaskPriority::LOWEST, kReason));
- EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc1->priority());
- EXPECT_EQ(base::TaskPriority::LOWEST, proc2->priority());
+ EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc1->GetPriority());
+ EXPECT_EQ(base::TaskPriority::LOWEST, proc2->GetPriority());
ExpectPriorityCounts(proc1.get(), 2, 0);
ExpectPriorityCounts(proc2.get(), 0, 0);
@@ -136,8 +136,8 @@
// execution priority of that process is now due to the second frame.
frame1_1->SetPriorityAndReason(
PriorityAndReason(base::TaskPriority::LOWEST, kReason));
- EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc1->priority());
- EXPECT_EQ(base::TaskPriority::LOWEST, proc2->priority());
+ EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc1->GetPriority());
+ EXPECT_EQ(base::TaskPriority::LOWEST, proc2->GetPriority());
ExpectPriorityCounts(proc1.get(), 1, 0);
ExpectPriorityCounts(proc2.get(), 0, 0);
@@ -145,8 +145,8 @@
// execution contexts in this process are now at LOWEST.
frame1_2->SetPriorityAndReason(
PriorityAndReason(base::TaskPriority::LOWEST, kReason));
- EXPECT_EQ(base::TaskPriority::LOWEST, proc1->priority());
- EXPECT_EQ(base::TaskPriority::LOWEST, proc2->priority());
+ EXPECT_EQ(base::TaskPriority::LOWEST, proc1->GetPriority());
+ EXPECT_EQ(base::TaskPriority::LOWEST, proc2->GetPriority());
ExpectPriorityCounts(proc1.get(), 0, 0);
ExpectPriorityCounts(proc2.get(), 0, 0);
@@ -154,8 +154,8 @@
// with the highest priority and thus dictates the priority of this process.
worker1->SetPriorityAndReason(
PriorityAndReason(base::TaskPriority::USER_VISIBLE, kReason));
- EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc1->priority());
- EXPECT_EQ(base::TaskPriority::LOWEST, proc2->priority());
+ EXPECT_EQ(base::TaskPriority::USER_VISIBLE, proc1->GetPriority());
+ EXPECT_EQ(base::TaskPriority::LOWEST, proc2->GetPriority());
ExpectPriorityCounts(proc1.get(), 1, 0);
ExpectPriorityCounts(proc2.get(), 0, 0);
@@ -163,8 +163,8 @@
// contexts in this process are now at LOWEST.
worker1->SetPriorityAndReason(
PriorityAndReason(base::TaskPriority::LOWEST, kReason));
- EXPECT_EQ(base::TaskPriority::LOWEST, proc1->priority());
- EXPECT_EQ(base::TaskPriority::LOWEST, proc2->priority());
+ EXPECT_EQ(base::TaskPriority::LOWEST, proc1->GetPriority());
+ EXPECT_EQ(base::TaskPriority::LOWEST, proc2->GetPriority());
ExpectPriorityCounts(proc1.get(), 0, 0);
ExpectPriorityCounts(proc2.get(), 0, 0);
}
diff --git a/components/performance_manager/graph/frame_node_impl.cc b/components/performance_manager/graph/frame_node_impl.cc
index 7aae44f..57cde76 100644
--- a/components/performance_manager/graph/frame_node_impl.cc
+++ b/components/performance_manager/graph/frame_node_impl.cc
@@ -42,9 +42,7 @@
browsing_instance_id_(browsing_instance_id),
site_instance_id_(site_instance_id),
render_frame_host_proxy_(content::GlobalRenderFrameHostId(
- process_node->render_process_host_proxy()
- .render_process_host_id()
- .value(),
+ process_node->GetRenderProcessHostId().value(),
render_frame_id)) {
// Nodes are created on the UI thread, then accessed on the PM sequence.
// `weak_this_` can be returned from GetWeakPtrOnUIThread() and dereferenced
@@ -666,7 +664,7 @@
DCHECK(GetWeakPtr().get());
// Enable querying this node using process and frame routing ids.
- graph()->RegisterFrameNodeForId(process_node_->GetRenderProcessId(),
+ graph()->RegisterFrameNodeForId(process_node_->GetRenderProcessHostId(),
render_frame_id_, this);
// Notify the initializing observers.
@@ -704,7 +702,7 @@
graph()->NotifyFrameNodeTearingDown(this);
// Disable querying this node using process and frame routing ids.
- graph()->UnregisterFrameNodeForId(process_node_->GetRenderProcessId(),
+ graph()->UnregisterFrameNodeForId(process_node_->GetRenderProcessHostId(),
render_frame_id_, this);
}
diff --git a/components/performance_manager/graph/frame_node_impl_unittest.cc b/components/performance_manager/graph/frame_node_impl_unittest.cc
index 3327eef..71d161a 100644
--- a/components/performance_manager/graph/frame_node_impl_unittest.cc
+++ b/components/performance_manager/graph/frame_node_impl_unittest.cc
@@ -78,13 +78,13 @@
auto frame_a2 = CreateFrameNodeAutoId(process_a.get(), page.get());
auto frame_b1 = CreateFrameNodeAutoId(process_b.get(), page.get());
- EXPECT_EQ(graph()->GetFrameNodeById(process_a->GetRenderProcessId(),
+ EXPECT_EQ(graph()->GetFrameNodeById(process_a->GetRenderProcessHostId(),
frame_a1->render_frame_id()),
frame_a1.get());
- EXPECT_EQ(graph()->GetFrameNodeById(process_a->GetRenderProcessId(),
+ EXPECT_EQ(graph()->GetFrameNodeById(process_a->GetRenderProcessHostId(),
frame_a2->render_frame_id()),
frame_a2.get());
- EXPECT_EQ(graph()->GetFrameNodeById(process_b->GetRenderProcessId(),
+ EXPECT_EQ(graph()->GetFrameNodeById(process_b->GetRenderProcessHostId(),
frame_b1->render_frame_id()),
frame_b1.get());
}
diff --git a/components/performance_manager/graph/policies/process_priority_policy_unittest.cc b/components/performance_manager/graph/policies/process_priority_policy_unittest.cc
index 47782e16..6df12dbd8 100644
--- a/components/performance_manager/graph/policies/process_priority_policy_unittest.cc
+++ b/components/performance_manager/graph/policies/process_priority_policy_unittest.cc
@@ -45,7 +45,7 @@
PerformanceManager::CallOnGraph(
FROM_HERE, base::BindLambdaForTesting([process_node]() {
process_node->set_priority(
- GetOppositePriority(process_node->priority()));
+ GetOppositePriority(process_node->GetPriority()));
}));
}
diff --git a/components/performance_manager/graph/process_node_impl.cc b/components/performance_manager/graph/process_node_impl.cc
index 3921ffc..7afda65 100644
--- a/components/performance_manager/graph/process_node_impl.cc
+++ b/components/performance_manager/graph/process_node_impl.cc
@@ -198,12 +198,13 @@
const std::string& ProcessNodeImpl::GetMetricsName() const {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- return metrics_name();
+ return metrics_name_;
}
bool ProcessNodeImpl::GetMainThreadTaskLoadIsLow() const {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- return main_thread_task_load_is_low();
+ DCHECK_EQ(process_type_, content::PROCESS_TYPE_RENDERER);
+ return main_thread_task_load_is_low_.value();
}
uint64_t ProcessNodeImpl::GetPrivateFootprintKb() const {
@@ -217,15 +218,13 @@
}
RenderProcessHostId ProcessNodeImpl::GetRenderProcessHostId() const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- return GetRenderProcessId();
+ return GetRenderProcessHostProxy().render_process_host_id();
}
const RenderProcessHostProxy& ProcessNodeImpl::GetRenderProcessHostProxy()
const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DCHECK_EQ(process_type_, content::PROCESS_TYPE_RENDERER);
- return render_process_host_proxy();
+ return absl::get<RenderProcessHostProxy>(child_process_host_proxy_);
}
const BrowserChildProcessHostProxy&
@@ -233,18 +232,30 @@
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DCHECK_NE(process_type_, content::PROCESS_TYPE_BROWSER);
DCHECK_NE(process_type_, content::PROCESS_TYPE_RENDERER);
- return browser_child_process_host_proxy();
+ return absl::get<BrowserChildProcessHostProxy>(child_process_host_proxy_);
}
base::TaskPriority ProcessNodeImpl::GetPriority() const {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- return priority();
+ return priority_.value();
}
ProcessNode::ContentTypes ProcessNodeImpl::GetHostedContentTypes() const {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DCHECK_EQ(process_type_, content::PROCESS_TYPE_RENDERER);
- return hosted_content_types();
+ return hosted_content_types_;
+}
+
+const base::flat_set<FrameNodeImpl*>& ProcessNodeImpl::frame_nodes() const {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+ DCHECK_EQ(process_type_, content::PROCESS_TYPE_RENDERER);
+ return frame_nodes_;
+}
+
+const base::flat_set<WorkerNodeImpl*>& ProcessNodeImpl::worker_nodes() const {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+ DCHECK_EQ(process_type_, content::PROCESS_TYPE_RENDERER);
+ return worker_nodes_;
}
void ProcessNodeImpl::SetProcessExitStatus(int32_t exit_status) {
@@ -278,37 +289,6 @@
SetProcessImpl(std::move(process), pid, launch_time);
}
-const base::flat_set<FrameNodeImpl*>& ProcessNodeImpl::frame_nodes() const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK_EQ(process_type_, content::PROCESS_TYPE_RENDERER);
- return frame_nodes_;
-}
-
-const base::flat_set<WorkerNodeImpl*>& ProcessNodeImpl::worker_nodes() const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK_EQ(process_type_, content::PROCESS_TYPE_RENDERER);
- return worker_nodes_;
-}
-
-PageNodeImpl* ProcessNodeImpl::GetPageNodeIfExclusive() const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK_EQ(process_type_, content::PROCESS_TYPE_RENDERER);
-
- PageNodeImpl* page_node = nullptr;
- for (auto* frame_node : frame_nodes_) {
- if (!page_node)
- page_node = frame_node->page_node();
- if (page_node != frame_node->page_node())
- return nullptr;
- }
- return page_node;
-}
-
-RenderProcessHostId ProcessNodeImpl::GetRenderProcessId() const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- return render_process_host_proxy().render_process_host_id();
-}
-
void ProcessNodeImpl::AddFrame(FrameNodeImpl* frame_node) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DCHECK_EQ(process_type_, content::PROCESS_TYPE_RENDERER);
diff --git a/components/performance_manager/graph/process_node_impl.h b/components/performance_manager/graph/process_node_impl.h
index 41b391d4..f16ebcd 100644
--- a/components/performance_manager/graph/process_node_impl.h
+++ b/components/performance_manager/graph/process_node_impl.h
@@ -111,11 +111,14 @@
base::TaskPriority GetPriority() const override;
ContentTypes GetHostedContentTypes() const override;
+ // Private implementation properties.
+ const base::flat_set<FrameNodeImpl*>& frame_nodes() const;
+ const base::flat_set<WorkerNodeImpl*>& worker_nodes() const;
+
void SetProcessExitStatus(int32_t exit_status);
void SetProcessMetricsName(const std::string& metrics_name);
void SetProcess(base::Process process, base::TimeTicks launch_time);
- // Private implementation properties.
void set_private_footprint_kb(uint64_t private_footprint_kb) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
private_footprint_kb_ = private_footprint_kb;
@@ -125,50 +128,6 @@
resident_set_kb_ = resident_set_kb;
}
- const base::flat_set<FrameNodeImpl*>& frame_nodes() const;
- const base::flat_set<WorkerNodeImpl*>& worker_nodes() const;
-
- // Returns the render process id (equivalent to RenderProcessHost::GetID()),
- // or ChildProcessHost::kInvalidUniqueID if this is not a renderer.
- RenderProcessHostId GetRenderProcessId() const;
-
- // If this process is associated with only one page, returns that page.
- // Otherwise, returns nullptr.
- PageNodeImpl* GetPageNodeIfExclusive() const;
-
- const std::string& metrics_name() const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- return metrics_name_;
- }
-
- bool main_thread_task_load_is_low() const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK_EQ(process_type_, content::PROCESS_TYPE_RENDERER);
- return main_thread_task_load_is_low_.value();
- }
-
- const RenderProcessHostProxy& render_process_host_proxy() const {
- DCHECK_EQ(process_type_, content::PROCESS_TYPE_RENDERER);
- return absl::get<RenderProcessHostProxy>(child_process_host_proxy_);
- }
-
- const BrowserChildProcessHostProxy& browser_child_process_host_proxy() const {
- DCHECK_NE(process_type_, content::PROCESS_TYPE_BROWSER);
- DCHECK_NE(process_type_, content::PROCESS_TYPE_RENDERER);
- return absl::get<BrowserChildProcessHostProxy>(child_process_host_proxy_);
- }
-
- base::TaskPriority priority() const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- return priority_.value();
- }
-
- ContentTypes hosted_content_types() const {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK_EQ(process_type_, content::PROCESS_TYPE_RENDERER);
- return hosted_content_types_;
- }
-
// Add |frame_node| to this process.
void AddFrame(FrameNodeImpl* frame_node);
// Removes |frame_node| from the set of frames hosted by this process. Invoked
diff --git a/components/performance_manager/graph/process_node_impl_describer.cc b/components/performance_manager/graph/process_node_impl_describer.cc
index a4899f4..b600c634 100644
--- a/components/performance_manager/graph/process_node_impl_describer.cc
+++ b/components/performance_manager/graph/process_node_impl_describer.cc
@@ -166,11 +166,11 @@
ret.Set("exit_status", impl->GetExitStatus().value());
}
- if (!impl->metrics_name().empty()) {
- ret.Set("metrics_name", impl->metrics_name());
+ if (!impl->GetMetricsName().empty()) {
+ ret.Set("metrics_name", impl->GetMetricsName());
}
- ret.Set("priority", base::TaskPriorityToString(impl->priority()));
+ ret.Set("priority", base::TaskPriorityToString(impl->GetPriority()));
if (impl->GetPrivateFootprintKb()) {
ret.Set("private_footprint_kb",
@@ -193,17 +193,16 @@
if (impl->GetProcessType() == content::PROCESS_TYPE_RENDERER) {
// Renderer-only properties.
- ret.Set("render_process_id", impl->GetRenderProcessId().value());
+ ret.Set("render_process_id", impl->GetRenderProcessHostId().value());
- ret.Set("main_thread_task_load_is_low",
- impl->main_thread_task_load_is_low());
+ ret.Set("main_thread_task_load_is_low", impl->GetMainThreadTaskLoadIsLow());
ret.Set("hosted_content_types",
- HostedProcessTypesToString(impl->hosted_content_types()));
+ HostedProcessTypesToString(impl->GetHostedContentTypes()));
} else if (impl->GetProcessType() != content::PROCESS_TYPE_BROWSER) {
// Non-renderer child process properties.
ret.Set("browser_child_process_host_id",
- impl->browser_child_process_host_proxy()
+ impl->GetBrowserChildProcessHostProxy()
.browser_child_process_host_id()
.value());
}
diff --git a/components/performance_manager/graph/process_node_impl_unittest.cc b/components/performance_manager/graph/process_node_impl_unittest.cc
index 137bd98..65c0530 100644
--- a/components/performance_manager/graph/process_node_impl_unittest.cc
+++ b/components/performance_manager/graph/process_node_impl_unittest.cc
@@ -92,30 +92,6 @@
EXPECT_EQ(0U, process_node->GetResidentSetKb());
}
-TEST_F(ProcessNodeImplTest, GetPageNodeIfExclusive) {
- {
- MockSinglePageInSingleProcessGraph g(graph());
- EXPECT_EQ(g.page.get(), g.process.get()->GetPageNodeIfExclusive());
- }
-
- {
- MockSinglePageWithMultipleProcessesGraph g(graph());
- EXPECT_EQ(g.page.get(), g.process.get()->GetPageNodeIfExclusive());
- }
-
- {
- MockMultiplePagesInSingleProcessGraph g(graph());
- EXPECT_FALSE(g.process.get()->GetPageNodeIfExclusive());
- }
-
- {
- MockMultiplePagesWithMultipleProcessesGraph g(graph());
- EXPECT_FALSE(g.process.get()->GetPageNodeIfExclusive());
- EXPECT_EQ(g.other_page.get(),
- g.other_process.get()->GetPageNodeIfExclusive());
- }
-}
-
namespace {
class LenientMockObserver : public ProcessNodeImpl::Observer {
@@ -177,7 +153,7 @@
EXPECT_EQ(raw_process_node, obs.TakeNotifiedProcessNode());
// This call does nothing as the priority is always at LOWEST.
- EXPECT_EQ(base::TaskPriority::LOWEST, process_node->priority());
+ EXPECT_EQ(base::TaskPriority::LOWEST, process_node->GetPriority());
process_node->set_priority(base::TaskPriority::LOWEST);
// This call should fire a notification.
@@ -239,14 +215,16 @@
auto child_frame_node = CreateFrameNodeAutoId(
process_node.get(), page_node.get(), main_frame_node.get());
- // Simply test that the public interface impls yield the same result as their
- // private counterpart.
const std::string kMetricsName("TestUtilityProcess");
process_node->SetProcessMetricsName(kMetricsName);
- EXPECT_EQ(process_node->metrics_name(), kMetricsName);
- EXPECT_EQ(process_node->metrics_name(),
- public_process_node->GetMetricsName());
+ EXPECT_EQ(process_node->GetMetricsName(), kMetricsName);
+
+ process_node->SetMainThreadTaskLoadIsLow(true);
+ EXPECT_TRUE(process_node->GetMainThreadTaskLoadIsLow());
+
+ // For properties returning nodes, simply test that the public interface impls
+ // yield the same result as their private counterpart.
const auto& frame_nodes = process_node->frame_nodes();
auto public_frame_nodes = public_process_node->GetFrameNodes();
@@ -263,10 +241,6 @@
return true;
});
EXPECT_EQ(public_frame_nodes, visited_frame_nodes);
-
- process_node->SetMainThreadTaskLoadIsLow(true);
- EXPECT_EQ(process_node->main_thread_task_load_is_low(),
- public_process_node->GetMainThreadTaskLoadIsLow());
}
namespace {
diff --git a/components/performance_manager/resource_attribution/frame_context.cc b/components/performance_manager/resource_attribution/frame_context.cc
index 2315809..19d39ce 100644
--- a/components/performance_manager/resource_attribution/frame_context.cc
+++ b/components/performance_manager/resource_attribution/frame_context.cc
@@ -90,7 +90,7 @@
auto* node_impl = FrameNodeImpl::FromNode(node);
CHECK(node_impl->process_node());
content::GlobalRenderFrameHostId global_id(
- node_impl->process_node()->GetRenderProcessId().GetUnsafeValue(),
+ node_impl->process_node()->GetRenderProcessHostId().GetUnsafeValue(),
node_impl->render_frame_id());
CHECK(IsValidId(global_id));
return FrameContext(global_id, node_impl->GetWeakPtr());
diff --git a/components/performance_manager/resource_attribution/process_context.cc b/components/performance_manager/resource_attribution/process_context.cc
index 5494914..9866581 100644
--- a/components/performance_manager/resource_attribution/process_context.cc
+++ b/components/performance_manager/resource_attribution/process_context.cc
@@ -140,11 +140,11 @@
id = BrowserProcessTag{};
break;
case content::PROCESS_TYPE_RENDERER:
- id = node_impl->render_process_host_proxy().render_process_host_id();
+ id = node_impl->GetRenderProcessHostId();
CHECK(!absl::get<RenderProcessHostId>(id).is_null());
break;
default:
- id = node_impl->browser_child_process_host_proxy()
+ id = node_impl->GetBrowserChildProcessHostProxy()
.browser_child_process_host_id();
CHECK(!absl::get<BrowserChildProcessHostId>(id).is_null());
break;
diff --git a/components/performance_manager/test_support/mock_graphs_unittest.cc b/components/performance_manager/test_support/mock_graphs_unittest.cc
index 3b181d6..10c8b7b9 100644
--- a/components/performance_manager/test_support/mock_graphs_unittest.cc
+++ b/components/performance_manager/test_support/mock_graphs_unittest.cc
@@ -44,11 +44,11 @@
// Make sure the ProcessNodes have valid RenderProcessHostId's or
// BrowserChildProcessHostId's.
const RenderProcessHostProxy& process_proxy =
- mock_graph.process->render_process_host_proxy();
+ mock_graph.process->GetRenderProcessHostProxy();
const RenderProcessHostProxy& other_process_proxy =
- mock_graph.other_process->render_process_host_proxy();
+ mock_graph.other_process->GetRenderProcessHostProxy();
const BrowserChildProcessHostProxy& utility_process_proxy =
- mock_graph.utility_process->browser_child_process_host_proxy();
+ mock_graph.utility_process->GetBrowserChildProcessHostProxy();
EXPECT_FALSE(process_proxy.render_process_host_id().is_null());
EXPECT_FALSE(other_process_proxy.render_process_host_id().is_null());
EXPECT_NE(process_proxy.render_process_host_id(),
@@ -59,7 +59,7 @@
const auto custom_process = TestNodeWrapper<TestProcessNodeImpl>::Create(
graph(), content::ProcessType::PROCESS_TYPE_GPU);
const BrowserChildProcessHostProxy& custom_process_proxy =
- custom_process->browser_child_process_host_proxy();
+ custom_process->GetBrowserChildProcessHostProxy();
EXPECT_FALSE(custom_process_proxy.browser_child_process_host_id().is_null());
EXPECT_NE(utility_process_proxy.browser_child_process_host_id(),
custom_process_proxy.browser_child_process_host_id());
diff --git a/components/performance_manager/v8_memory/v8_context_tracker.cc b/components/performance_manager/v8_memory/v8_context_tracker.cc
index 709095d..cebcbad 100644
--- a/components/performance_manager/v8_memory/v8_context_tracker.cc
+++ b/components/performance_manager/v8_memory/v8_context_tracker.cc
@@ -277,9 +277,7 @@
});
// Posts |on_ui_thread| to the UI sequence.
- auto rph_id = parent_frame_node->process_node()
- ->render_process_host_proxy()
- .render_process_host_id();
+ auto rph_id = parent_frame_node->process_node()->GetRenderProcessHostId();
content::GetUIThreadTaskRunner({})->PostTask(
FROM_HERE, base::BindOnce(std::move(on_ui_thread), std::move(on_pm_seq),
std::move(data), rph_id));