Index: content/browser/frame_host/navigator_impl_unittest.cc |
diff --git a/content/browser/frame_host/navigator_impl_unittest.cc b/content/browser/frame_host/navigator_impl_unittest.cc |
index 96afc97d3479fbf69b0575ba16bdf879d1bfb3eb..f50512bf43a4e8cc2e5c15226052f87ac33a9a59 100644 |
--- a/content/browser/frame_host/navigator_impl_unittest.cc |
+++ b/content/browser/frame_host/navigator_impl_unittest.cc |
@@ -79,6 +79,10 @@ class NavigatorTestWithBrowserSideNavigation |
return static_cast<NavigatorImpl*>(frame_tree_node->navigator()) |
->GetNavigationRequestForNodeForTesting(frame_tree_node); |
} |
+ |
+ RenderFrameHost* GetSpeculativeRenderFrameHost(RenderFrameHostManager* rfhm) { |
+ return rfhm->speculative_render_frame_host_.get(); |
+ } |
}; |
// PlzNavigate: Test that a proper NavigationRequest is created by |
@@ -228,15 +232,15 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, CrossSiteNavigation) { |
scoped_refptr<ResourceResponse> response(new ResourceResponse); |
GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( |
Charlie Reis
2014/12/04 01:11:30
I'm a bit confused by what this means. Before, it
clamy
2014/12/05 17:16:19
The new RFH is only committed after this call (thi
Charlie Reis
2014/12/05 19:06:23
Oh, I get it. CallOnResponseStarted used to creat
carlosk
2014/12/09 07:55:41
I can do the audit but I'd need more details on wh
Charlie Reis
2014/12/10 22:37:44
Canceled or otherwise altered (e.g., committing a
carlosk
2014/12/16 01:53:47
Ack. As discussed let's leave that for when we rem
|
response, MakeEmptyStream()); |
- RenderFrameHostImpl* pending_rfh = |
- node->render_manager()->pending_frame_host(); |
- ASSERT_TRUE(pending_rfh); |
- EXPECT_NE(pending_rfh, rfh); |
- EXPECT_TRUE(pending_rfh->IsRenderFrameLive()); |
- EXPECT_TRUE(pending_rfh->render_view_host()->IsRenderViewLive()); |
+ RenderFrameHostImpl* final_rfh = main_test_rfh(); |
+ ASSERT_TRUE(final_rfh); |
+ EXPECT_NE(final_rfh, rfh); |
+ EXPECT_TRUE(final_rfh->IsRenderFrameLive()); |
+ EXPECT_TRUE(final_rfh->render_view_host()->IsRenderViewLive()); |
} |
-// PlzNavigate: Test that redirects are followed. |
+// PlzNavigate: Test that redirects are followed and the speculative renderer |
+// logic behaves as expected. |
TEST_F(NavigatorTestWithBrowserSideNavigation, RedirectCrossSite) { |
const GURL kUrl1("http://www.chromium.org/"); |
const GURL kUrl2("http://www.google.com/"); |
@@ -245,12 +249,14 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, RedirectCrossSite) { |
RenderFrameHostImpl* rfh = main_test_rfh(); |
EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh->rfh_state()); |
FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
+ RenderFrameHostManager* rfhm = node->render_manager(); |
// Navigate to a URL on the same site. |
SendRequestNavigation(node, kUrl1); |
main_test_rfh()->SendBeginNavigationWithURL(kUrl1); |
NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); |
ASSERT_TRUE(main_request); |
+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); |
// It then redirects to another site. |
net::RedirectInfo redirect_info; |
@@ -258,27 +264,29 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, RedirectCrossSite) { |
redirect_info.new_method = "GET"; |
redirect_info.new_url = kUrl2; |
redirect_info.new_first_party_for_cookies = kUrl2; |
- scoped_refptr<ResourceResponse> response(new ResourceResponse); |
+ scoped_refptr<ResourceResponse> response(new ResourceResponse); |
GetLoaderForNavigationRequest(main_request)->CallOnRequestRedirected( |
redirect_info, response); |
// The redirect should have been followed. |
EXPECT_EQ(1, GetLoaderForNavigationRequest(main_request)->redirect_count()); |
+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); |
Charlie Reis
2014/12/04 01:11:30
Why is there no speculative RFH after it redirects
carlosk
2014/12/09 07:55:41
Indeed that is a task for later on. The idea is to
Charlie Reis
2014/12/10 22:37:44
Later is fine. Worth noting that we wouldn't get
carlosk
2014/12/16 01:53:47
So if I understand correctly when server redirects
Charlie Reis
2015/01/12 23:30:51
[Just following up on an old thread. This probabl
carlosk
2015/01/13 15:54:12
Understood. To confirm: the server redirects are "
Charlie Reis
2015/01/13 18:48:21
Invisible to RFHM and the UI thread, correct. The
carlosk
2015/01/14 10:09:46
Acknowledged.
|
// Then it commits. |
response = new ResourceResponse; |
GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( |
response, MakeEmptyStream()); |
- RenderFrameHostImpl* pending_rfh = |
- node->render_manager()->pending_frame_host(); |
- ASSERT_TRUE(pending_rfh); |
- EXPECT_NE(pending_rfh, rfh); |
- EXPECT_TRUE(pending_rfh->IsRenderFrameLive()); |
- EXPECT_TRUE(pending_rfh->render_view_host()->IsRenderViewLive()); |
+ RenderFrameHostImpl* final_rfh = main_test_rfh(); |
+ ASSERT_TRUE(final_rfh); |
+ EXPECT_NE(final_rfh, rfh); |
+ EXPECT_TRUE(final_rfh->IsRenderFrameLive()); |
+ EXPECT_TRUE(final_rfh->render_view_host()->IsRenderViewLive()); |
+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); |
} |
-// PlzNavigate: Test that a navigation is cancelled if another request has been |
-// issued in the meantime. |
+// PlzNavigate: Test that a navigation is canceled if another request has been |
+// issued in the meantime. Also confirms that the speculative renderer is |
+// correctly updated in the process. |
TEST_F(NavigatorTestWithBrowserSideNavigation, ReplacePendingNavigation) { |
const GURL kUrl0("http://www.wikipedia.org/"); |
const GURL kUrl0_site = SiteInstance::GetSiteForURL(browser_context(), kUrl0); |
@@ -289,6 +297,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, ReplacePendingNavigation) { |
// Initialization. |
contents()->NavigateAndCommit(kUrl0); |
FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
+ RenderFrameHostManager* rfhm = node->render_manager(); |
EXPECT_EQ(kUrl0_site, main_test_rfh()->GetSiteInstance()->GetSiteURL()); |
// Request navigation to the 1st URL. |
@@ -300,6 +309,11 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, ReplacePendingNavigation) { |
base::WeakPtr<TestNavigationURLLoader> loader1 = |
GetLoaderForNavigationRequest(request1)->AsWeakPtr(); |
+ // Confirms a speculative RFH was created |
Charlie Reis
2014/12/04 01:11:30
nit: Please end sentences with a period, here and
carlosk
2014/12/09 07:55:41
Done.
|
+ ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); |
+ int32 first_site_id = |
Charlie Reis
2014/12/04 01:11:30
nit: site_instance_id1 and site_instance_id2 would
carlosk
2014/12/09 07:55:41
Done.
|
+ GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId(); |
Charlie Reis
2014/12/04 01:11:30
Let's also verify that GetSiteURL() is kUrl1_site
carlosk
2014/12/09 07:55:41
Done.
|
+ |
// Request navigation to the 2nd URL; the NavigationRequest must have been |
// replaced by a new one with a different URL. |
SendRequestNavigation(node, kUrl2); |
@@ -311,23 +325,32 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, ReplacePendingNavigation) { |
// Confirm that the first loader got destroyed. |
EXPECT_FALSE(loader1); |
+ // Confirms that a new speculative RFH was created |
+ ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); |
+ int32 second_site_id = |
+ GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId(); |
+ EXPECT_NE(first_site_id, second_site_id); |
+ |
// Confirm that the commit corresponds to the new request. |
scoped_refptr<ResourceResponse> response(new ResourceResponse); |
GetLoaderForNavigationRequest(request2)->CallOnResponseStarted( |
response, MakeEmptyStream()); |
- RenderFrameHostImpl* pending_rfh = |
- node->render_manager()->pending_frame_host(); |
- ASSERT_TRUE(pending_rfh); |
- EXPECT_EQ(kUrl2_site, pending_rfh->GetSiteInstance()->GetSiteURL()); |
+ ASSERT_TRUE(main_test_rfh()); |
+ EXPECT_EQ(kUrl2_site, main_test_rfh()->GetSiteInstance()->GetSiteURL()); |
+ |
+ // Confirms that the committed RFH is the new speculative one |
+ EXPECT_EQ(second_site_id, main_test_rfh()->GetSiteInstance()->GetId()); |
} |
// PlzNavigate: Test that a reload navigation is properly signaled to the |
-// renderer when the navigation can commit. |
+// renderer when the navigation can commit. Speculative renderers should not be |
+// created at any step. |
TEST_F(NavigatorTestWithBrowserSideNavigation, Reload) { |
const GURL kUrl("http://www.google.com/"); |
contents()->NavigateAndCommit(kUrl); |
FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
+ RenderFrameHostManager* rfhm = node->render_manager(); |
SendRequestNavigationWithParameters( |
node, kUrl, Referrer(), ui::PAGE_TRANSITION_LINK, |
NavigationController::RELOAD); |
@@ -338,9 +361,12 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, Reload) { |
ASSERT_TRUE(main_request != NULL); |
EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD, |
main_request->common_params().navigation_type); |
+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); |
+ |
int page_id = contents()->GetMaxPageIDForSiteInstance( |
main_test_rfh()->GetSiteInstance()) + 1; |
main_test_rfh()->SendNavigate(page_id, kUrl); |
+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); |
// Now do a shift+reload. |
SendRequestNavigationWithParameters( |
@@ -352,6 +378,104 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, Reload) { |
ASSERT_TRUE(main_request != NULL); |
EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD_IGNORING_CACHE, |
main_request->common_params().navigation_type); |
+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); |
+} |
+ |
+// PlzNavigate: Confirms that a speculative RenderFrameHost is used when |
+// navigating from one site to the another. |
+TEST_F(NavigatorTestWithBrowserSideNavigation, |
+ SpeculativeRendererWorksBaseCase) { |
+ // Navigate to an initial site. |
+ const GURL kUrlInit("http://wikipedia.org/"); |
+ contents()->NavigateAndCommit(kUrlInit); |
+ FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
+ RenderFrameHostManager* rfhm = node->render_manager(); |
+ ASSERT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); |
+ |
+ // Begin navigating to another site. |
+ const GURL kUrl("http://google.com/"); |
+ SendRequestNavigation(node, kUrl); |
+ contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl); |
+ ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); |
+ EXPECT_NE(GetSpeculativeRenderFrameHost(rfhm), main_test_rfh()); |
+ EXPECT_EQ( |
+ GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetSiteURL(), |
Charlie Reis
2014/12/04 01:11:30
nit: Switch argument order. (EXPECT_EQ(expected,
carlosk
2014/12/09 07:55:40
Done.
|
+ SiteInstanceImpl::GetSiteForURL(browser_context(), kUrl)); |
+ EXPECT_TRUE( |
+ GetSpeculativeRenderFrameHost(rfhm)->GetProcess()->HasConnection()); |
Charlie Reis
2014/12/04 01:11:30
We're in a unit test (with MockRenderProcessHosts)
clamy
2014/12/05 17:16:19
This could be replaced by a call to RFH::IsRenderF
carlosk
2014/12/09 07:55:41
Acknowledged and done.
|
+ int32 site_id = |
Charlie Reis
2014/12/04 01:11:30
Same nit as above.
carlosk
2014/12/09 07:55:41
Done.
|
+ GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId(); |
+ |
+ // Commit. |
Charlie Reis
2014/12/04 01:11:30
I'm still finding it very confusing to call this "
carlosk
2014/12/09 07:55:40
It seemed to me that "commit" was the usually acce
|
+ scoped_refptr<ResourceResponse> response(new ResourceResponse); |
+ GetLoaderForNavigationRequest(GetNavigationRequestForFrameTreeNode(node)) |
+ ->CallOnResponseStarted(response, MakeEmptyStream()); |
+ EXPECT_EQ(site_id, main_test_rfh()->GetSiteInstance()->GetId()); |
+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); |
+ |
+ // And just for completeness invoke OnDidCommitProvisionalLoad which |
+ // shouldn't change anything in RFHM. |
+ FrameHostMsg_DidCommitProvisionalLoad_Params params; |
+ params.page_id = 1; |
+ params.url = kUrl; |
+ params.was_within_same_page = false; |
+ params.is_post = false; |
+ params.post_id = -1; |
+ params.page_state = PageState::CreateForTesting(kUrl, false, 0, 0); |
+ main_test_rfh()->SendNavigateWithParams(¶ms); |
+ EXPECT_EQ(site_id, main_test_rfh()->GetSiteInstance()->GetId()); |
+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); |
+} |
+ |
+// PlzNavigate: Confirms that a speculative RenderFrameHost is thrown away when |
+// the final URL's site differ from the initial one due to redirects. |
Charlie Reis
2014/12/04 01:11:30
nit: differs
carlosk
2014/12/09 07:55:41
Done.
|
+TEST_F(NavigatorTestWithBrowserSideNavigation, |
+ SpeculativeRendererDiscardedAfterRedirectToAnotherSite) { |
+ // Navigate to an initial site. |
+ const GURL kUrlInit("http://wikipedia.org/"); |
+ contents()->NavigateAndCommit(kUrlInit); |
+ FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
+ RenderFrameHostManager* rfhm = node->render_manager(); |
+ ASSERT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); |
+ |
+ // Begin navigating to another site. |
+ const GURL kUrl("http://google.com/"); |
+ SendRequestNavigation(node, kUrl); |
+ contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl); |
+ int32 site_id = |
+ GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId(); |
+ ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); |
+ EXPECT_NE(GetSpeculativeRenderFrameHost(rfhm), main_test_rfh()); |
+ EXPECT_TRUE( |
+ GetSpeculativeRenderFrameHost(rfhm)->GetProcess()->HasConnection()); |
Charlie Reis
2014/12/04 01:11:30
Same as above.
carlosk
2014/12/09 07:55:41
Done.
|
+ EXPECT_EQ( |
+ GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetSiteURL(), |
+ SiteInstanceImpl::GetSiteForURL(browser_context(), kUrl)); |
+ |
+ // It then redirects to yet another site. |
+ NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); |
+ ASSERT_TRUE(main_request); |
+ const GURL kUrlRedirect("https://www.google.com/"); |
+ net::RedirectInfo redirect_info; |
+ redirect_info.status_code = 302; |
+ redirect_info.new_method = "GET"; |
+ redirect_info.new_url = kUrlRedirect; |
+ redirect_info.new_first_party_for_cookies = kUrlRedirect; |
+ scoped_refptr<ResourceResponse> response(new ResourceResponse); |
+ GetLoaderForNavigationRequest(main_request) |
+ ->CallOnRequestRedirected(redirect_info, response); |
+ ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm)); |
+ EXPECT_EQ(site_id, |
Charlie Reis
2014/12/04 01:11:30
The test says the redirect is expected to discard
carlosk
2014/12/09 07:55:41
As we're not *yet* monitoring redirects the specul
|
+ GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId()); |
+ |
+ // Commit. |
Charlie Reis
2014/12/04 01:11:30
See comment in previous test.
carlosk
2014/12/09 07:55:41
Done.
|
+ response = new ResourceResponse; |
+ GetLoaderForNavigationRequest(main_request) |
+ ->CallOnResponseStarted(response, MakeEmptyStream()); |
+ EXPECT_NE(site_id, main_test_rfh()->GetSiteInstance()->GetId()); |
+ EXPECT_EQ(main_test_rfh()->GetSiteInstance()->GetSiteURL(), |
+ SiteInstanceImpl::GetSiteForURL(browser_context(), kUrlRedirect)); |
+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm)); |
} |
} // namespace content |