Commit 5d722948 authored by Matt Falkenhagen's avatar Matt Falkenhagen Committed by Chromium LUCI CQ

prerender: Rename function to FindHostToActivate for clarity.

Bug: 1132746
Change-Id: Iee24aa91d115e315a56224857ede961452261df3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2633221
Commit-Queue: Matt Falkenhagen <falken@chromium.org>
Reviewed-by: default avatarHiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844476}
parent de6fdb12
...@@ -41,7 +41,7 @@ void PrerenderHostRegistry::AbandonHost(const GURL& prerendering_url) { ...@@ -41,7 +41,7 @@ void PrerenderHostRegistry::AbandonHost(const GURL& prerendering_url) {
prerender_host_by_url_.erase(prerendering_url); prerender_host_by_url_.erase(prerendering_url);
} }
std::unique_ptr<PrerenderHost> PrerenderHostRegistry::SelectForNavigation( std::unique_ptr<PrerenderHost> PrerenderHostRegistry::FindHostToActivate(
const GURL& navigation_url, const GURL& navigation_url,
FrameTreeNode& frame_tree_node) { FrameTreeNode& frame_tree_node) {
RenderFrameHostImpl* render_frame_host = frame_tree_node.current_frame_host(); RenderFrameHostImpl* render_frame_host = frame_tree_node.current_frame_host();
......
...@@ -47,7 +47,7 @@ class CONTENT_EXPORT PrerenderHostRegistry { ...@@ -47,7 +47,7 @@ class CONTENT_EXPORT PrerenderHostRegistry {
// Selects the host to activate for a navigation for the given FrameTreeNode. // Selects the host to activate for a navigation for the given FrameTreeNode.
// Returns nullptr if it's not found or not ready for activation yet. // Returns nullptr if it's not found or not ready for activation yet.
std::unique_ptr<PrerenderHost> SelectForNavigation( std::unique_ptr<PrerenderHost> FindHostToActivate(
const GURL& navigation_url, const GURL& navigation_url,
FrameTreeNode& frame_tree_node); FrameTreeNode& frame_tree_node);
......
...@@ -75,7 +75,7 @@ TEST_F(PrerenderHostRegistryTest, CreateAndStartHost) { ...@@ -75,7 +75,7 @@ TEST_F(PrerenderHostRegistryTest, CreateAndStartHost) {
// the prerendered page. // the prerendered page.
prerender_host->DidFinishNavigation(nullptr); prerender_host->DidFinishNavigation(nullptr);
EXPECT_TRUE(registry->SelectForNavigation( EXPECT_TRUE(registry->FindHostToActivate(
kPrerenderingUrl, *render_frame_host->frame_tree_node())); kPrerenderingUrl, *render_frame_host->frame_tree_node()));
EXPECT_EQ(registry->FindHostByUrlForTesting(kPrerenderingUrl), nullptr); EXPECT_EQ(registry->FindHostByUrlForTesting(kPrerenderingUrl), nullptr);
} }
...@@ -113,7 +113,7 @@ TEST_F(PrerenderHostRegistryTest, CreateAndStartHostForSameURL) { ...@@ -113,7 +113,7 @@ TEST_F(PrerenderHostRegistryTest, CreateAndStartHostForSameURL) {
// the prerendered page. // the prerendered page.
prerender_host1->DidFinishNavigation(nullptr); prerender_host1->DidFinishNavigation(nullptr);
EXPECT_TRUE(registry->SelectForNavigation( EXPECT_TRUE(registry->FindHostToActivate(
kPrerenderingUrl, *render_frame_host->frame_tree_node())); kPrerenderingUrl, *render_frame_host->frame_tree_node()));
EXPECT_EQ(registry->FindHostByUrlForTesting(kPrerenderingUrl), nullptr); EXPECT_EQ(registry->FindHostByUrlForTesting(kPrerenderingUrl), nullptr);
} }
...@@ -150,7 +150,7 @@ TEST_F(PrerenderHostRegistryTest, CreateAndStartHostForDifferentURLs) { ...@@ -150,7 +150,7 @@ TEST_F(PrerenderHostRegistryTest, CreateAndStartHostForDifferentURLs) {
prerender_host2->DidFinishNavigation(nullptr); prerender_host2->DidFinishNavigation(nullptr);
// Select the first host. // Select the first host.
EXPECT_TRUE(registry->SelectForNavigation( EXPECT_TRUE(registry->FindHostToActivate(
kPrerenderingUrl1, *render_frame_host->frame_tree_node())); kPrerenderingUrl1, *render_frame_host->frame_tree_node()));
EXPECT_EQ(registry->FindHostByUrlForTesting(kPrerenderingUrl1), nullptr); EXPECT_EQ(registry->FindHostByUrlForTesting(kPrerenderingUrl1), nullptr);
// The second host should still be findable. // The second host should still be findable.
...@@ -158,12 +158,12 @@ TEST_F(PrerenderHostRegistryTest, CreateAndStartHostForDifferentURLs) { ...@@ -158,12 +158,12 @@ TEST_F(PrerenderHostRegistryTest, CreateAndStartHostForDifferentURLs) {
prerender_host2); prerender_host2);
// Select the second host. // Select the second host.
EXPECT_TRUE(registry->SelectForNavigation( EXPECT_TRUE(registry->FindHostToActivate(
kPrerenderingUrl2, *render_frame_host->frame_tree_node())); kPrerenderingUrl2, *render_frame_host->frame_tree_node()));
EXPECT_EQ(registry->FindHostByUrlForTesting(kPrerenderingUrl2), nullptr); EXPECT_EQ(registry->FindHostByUrlForTesting(kPrerenderingUrl2), nullptr);
} }
TEST_F(PrerenderHostRegistryTest, SelectForNavigationBeforeReadyForActivation) { TEST_F(PrerenderHostRegistryTest, FindHostToActivateBeforeReadyForActivation) {
std::unique_ptr<TestWebContents> web_contents = std::unique_ptr<TestWebContents> web_contents =
CreateWebContents(GURL("https://example.com/")); CreateWebContents(GURL("https://example.com/"));
RenderFrameHostImpl* render_frame_host = web_contents->GetMainFrame(); RenderFrameHostImpl* render_frame_host = web_contents->GetMainFrame();
...@@ -183,7 +183,7 @@ TEST_F(PrerenderHostRegistryTest, SelectForNavigationBeforeReadyForActivation) { ...@@ -183,7 +183,7 @@ TEST_F(PrerenderHostRegistryTest, SelectForNavigationBeforeReadyForActivation) {
// The prerender host is not ready for activation yet, so the registry // The prerender host is not ready for activation yet, so the registry
// shouldn't select the host and instead should abandon it. // shouldn't select the host and instead should abandon it.
ASSERT_FALSE(prerender_host->is_ready_for_activation()); ASSERT_FALSE(prerender_host->is_ready_for_activation());
EXPECT_FALSE(registry->SelectForNavigation( EXPECT_FALSE(registry->FindHostToActivate(
kPrerenderingUrl, *render_frame_host->frame_tree_node())); kPrerenderingUrl, *render_frame_host->frame_tree_node()));
EXPECT_EQ(registry->FindHostByUrlForTesting(kPrerenderingUrl), nullptr); EXPECT_EQ(registry->FindHostByUrlForTesting(kPrerenderingUrl), nullptr);
} }
......
...@@ -1552,8 +1552,8 @@ void NavigationRequest::BeginNavigation() { ...@@ -1552,8 +1552,8 @@ void NavigationRequest::BeginNavigation() {
storage_partition_impl->GetPrerenderHostRegistry(); storage_partition_impl->GetPrerenderHostRegistry();
DCHECK(prerender_host_registry); DCHECK(prerender_host_registry);
std::unique_ptr<PrerenderHost> prerender_host = std::unique_ptr<PrerenderHost> prerender_host =
prerender_host_registry->SelectForNavigation(common_params_->url, prerender_host_registry->FindHostToActivate(common_params_->url,
*frame_tree_node_); *frame_tree_node_);
switch (blink::features::kPrerender2Param.Get()) { switch (blink::features::kPrerender2Param.Get()) {
case blink::features::Prerender2ActivationMode::kEnabled: case blink::features::Prerender2ActivationMode::kEnabled:
// If `prerender_host_` exists, this navigation will activate the // If `prerender_host_` exists, this navigation will activate the
......
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