Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/content/renderer/render_view_browsertest.cc

Issue 181113009: Revert 253010 "Revert 251563 "Move browser initiated navigation ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/content/renderer/render_frame_impl.cc ('k') | trunk/src/content/renderer/render_view_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/renderer/render_view_browsertest.cc
===================================================================
--- trunk/src/content/renderer/render_view_browsertest.cc (revision 254165)
+++ trunk/src/content/renderer/render_view_browsertest.cc (working copy)
@@ -331,11 +331,11 @@
}
TEST_F(RenderViewImplTest, OnNavigationHttpPost) {
- ViewMsg_Navigate_Params nav_params;
+ FrameMsg_Navigate_Params nav_params;
// An http url will trigger a resource load so cannot be used here.
nav_params.url = GURL("data:text/html,<div>Page</div>");
- nav_params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
nav_params.transition = PAGE_TRANSITION_TYPED;
nav_params.page_id = -1;
nav_params.is_post = true;
@@ -347,7 +347,7 @@
const std::vector<unsigned char> post_data(raw_data, raw_data + length);
nav_params.browser_initiated_post_data = post_data;
- view()->OnNavigate(nav_params);
+ frame()->OnNavigate(nav_params);
ProcessPendingMessages();
const IPC::Message* frame_navigate_msg =
@@ -536,15 +536,15 @@
// If we navigate back to this RenderView, ensure we don't send a state
// update for the swapped out URL. (http://crbug.com/72235)
- ViewMsg_Navigate_Params nav_params;
+ FrameMsg_Navigate_Params nav_params;
nav_params.url = GURL("data:text/html,<div>Page B</div>");
- nav_params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
nav_params.transition = PAGE_TRANSITION_TYPED;
nav_params.current_history_list_length = 1;
nav_params.current_history_list_offset = 0;
nav_params.pending_history_list_offset = 1;
nav_params.page_id = -1;
- view()->OnNavigate(nav_params);
+ frame()->OnNavigate(nav_params);
ProcessPendingMessages();
const IPC::Message* msg3 = render_thread_->sink().GetUniqueMessageMatching(
ViewHostMsg_UpdateState::ID);
@@ -572,15 +572,15 @@
render_thread_->sink().ClearMessages();
// Back to page A (page_id 1) and commit.
- ViewMsg_Navigate_Params params_A;
- params_A.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ FrameMsg_Navigate_Params params_A;
+ params_A.navigation_type = FrameMsg_Navigate_Type::NORMAL;
params_A.transition = PAGE_TRANSITION_FORWARD_BACK;
params_A.current_history_list_length = 2;
params_A.current_history_list_offset = 1;
params_A.pending_history_list_offset = 0;
params_A.page_id = 1;
params_A.page_state = state_A;
- view()->OnNavigate(params_A);
+ frame()->OnNavigate(params_A);
ProcessPendingMessages();
// Respond to a swap out request.
@@ -596,16 +596,16 @@
// params.page_state of the initial page (e.g., if the new page fails the
// provisional load in the renderer process, after we unload the old page).
// Ensure the old page gets reloaded, not swappedout://.
- ViewMsg_Navigate_Params nav_params;
+ FrameMsg_Navigate_Params nav_params;
nav_params.url = GURL("data:text/html,<div>Page A</div>");
- nav_params.navigation_type = ViewMsg_Navigate_Type::RELOAD;
+ nav_params.navigation_type = FrameMsg_Navigate_Type::RELOAD;
nav_params.transition = PAGE_TRANSITION_RELOAD;
nav_params.current_history_list_length = 2;
nav_params.current_history_list_offset = 0;
nav_params.pending_history_list_offset = 0;
nav_params.page_id = 1;
nav_params.page_state = state_A;
- view()->OnNavigate(nav_params);
+ frame()->OnNavigate(nav_params);
ProcessPendingMessages();
// Verify page A committed, not swappedout://.
@@ -674,15 +674,15 @@
render_thread_->sink().ClearMessages();
// Go back to C and commit, preparing for our real test.
- ViewMsg_Navigate_Params params_C;
- params_C.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ FrameMsg_Navigate_Params params_C;
+ params_C.navigation_type = FrameMsg_Navigate_Type::NORMAL;
params_C.transition = PAGE_TRANSITION_FORWARD_BACK;
params_C.current_history_list_length = 4;
params_C.current_history_list_offset = 3;
params_C.pending_history_list_offset = 2;
params_C.page_id = 3;
params_C.page_state = state_C;
- view()->OnNavigate(params_C);
+ frame()->OnNavigate(params_C);
ProcessPendingMessages();
render_thread_->sink().ClearMessages();
@@ -691,26 +691,26 @@
// the RenderView's page ID.
// Back to page B (page_id 2), without committing.
- ViewMsg_Navigate_Params params_B;
- params_B.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ FrameMsg_Navigate_Params params_B;
+ params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL;
params_B.transition = PAGE_TRANSITION_FORWARD_BACK;
params_B.current_history_list_length = 4;
params_B.current_history_list_offset = 2;
params_B.pending_history_list_offset = 1;
params_B.page_id = 2;
params_B.page_state = state_B;
- view()->OnNavigate(params_B);
+ frame()->OnNavigate(params_B);
// Back to page A (page_id 1) and commit.
- ViewMsg_Navigate_Params params;
- params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ FrameMsg_Navigate_Params params;
+ params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
params.transition = PAGE_TRANSITION_FORWARD_BACK;
params_B.current_history_list_length = 4;
params_B.current_history_list_offset = 2;
params_B.pending_history_list_offset = 0;
params.page_id = 1;
params.page_state = state_A;
- view()->OnNavigate(params);
+ frame()->OnNavigate(params);
ProcessPendingMessages();
// Now ensure that the UpdateState message we receive is consistent
@@ -755,15 +755,15 @@
render_thread_->sink().ClearMessages();
// Back to page A (page_id 1) and commit.
- ViewMsg_Navigate_Params params_A;
- params_A.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ FrameMsg_Navigate_Params params_A;
+ params_A.navigation_type = FrameMsg_Navigate_Type::NORMAL;
params_A.transition = PAGE_TRANSITION_FORWARD_BACK;
params_A.current_history_list_length = 2;
params_A.current_history_list_offset = 1;
params_A.pending_history_list_offset = 0;
params_A.page_id = 1;
params_A.page_state = state_A;
- view()->OnNavigate(params_A);
+ frame()->OnNavigate(params_A);
ProcessPendingMessages();
// A new navigation commits, clearing the forward history.
@@ -773,15 +773,15 @@
EXPECT_EQ(3, view()->history_page_ids_[1]);
// The browser then sends a stale navigation to B, which should be ignored.
- ViewMsg_Navigate_Params params_B;
- params_B.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ FrameMsg_Navigate_Params params_B;
+ params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL;
params_B.transition = PAGE_TRANSITION_FORWARD_BACK;
params_B.current_history_list_length = 2;
params_B.current_history_list_offset = 0;
params_B.pending_history_list_offset = 1;
params_B.page_id = 2;
params_B.page_state = state_A; // Doesn't matter, just has to be present.
- view()->OnNavigate(params_B);
+ frame()->OnNavigate(params_B);
// State should be unchanged.
EXPECT_EQ(2, view()->history_list_length_);
@@ -839,15 +839,15 @@
// Suppose the browser has limited the number of NavigationEntries to 2.
// It has now dropped the first entry, but the renderer isn't notified.
// Ensure that going back to page B (page_id 2) at offset 0 is successful.
- ViewMsg_Navigate_Params params_B;
- params_B.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ FrameMsg_Navigate_Params params_B;
+ params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL;
params_B.transition = PAGE_TRANSITION_FORWARD_BACK;
params_B.current_history_list_length = 2;
params_B.current_history_list_offset = 1;
params_B.pending_history_list_offset = 0;
params_B.page_id = 2;
params_B.page_state = state_B;
- view()->OnNavigate(params_B);
+ frame()->OnNavigate(params_B);
ProcessPendingMessages();
EXPECT_EQ(2, view()->history_list_length_);
@@ -1558,11 +1558,11 @@
// Start a load that will reach provisional state synchronously,
// but won't complete synchronously.
- ViewMsg_Navigate_Params params;
+ FrameMsg_Navigate_Params params;
params.page_id = -1;
- params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
params.url = GURL("data:text/html,test data");
- view()->OnNavigate(params);
+ frame()->OnNavigate(params);
// An error occurred.
view()->main_render_frame()->didFailProvisionalLoad(web_frame, error);
@@ -1580,11 +1580,11 @@
// Start a load that will reach provisional state synchronously,
// but won't complete synchronously.
- ViewMsg_Navigate_Params params;
+ FrameMsg_Navigate_Params params;
params.page_id = -1;
- params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
params.url = GURL("data:text/html,test data");
- view()->OnNavigate(params);
+ frame()->OnNavigate(params);
// A cancellation occurred.
view()->main_render_frame()->didFailProvisionalLoad(web_frame, error);
@@ -1913,16 +1913,16 @@
const double kMinZoomLevel = ZoomFactorToZoomLevel(kMinimumZoomFactor);
const double kMaxZoomLevel = ZoomFactorToZoomLevel(kMaximumZoomFactor);
- ViewMsg_Navigate_Params params;
+ FrameMsg_Navigate_Params params;
params.page_id = -1;
- params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
// Verifies navigation to a URL with preset zoom level indeed sets the level.
// Regression test for http://crbug.com/139559, where the level was not
// properly set when it is out of the default zoom limits of WebView.
params.url = GURL("data:text/html,min_zoomlimit_test");
view()->OnSetZoomLevelForLoadingURL(params.url, kMinZoomLevel);
- view()->OnNavigate(params);
+ frame()->OnNavigate(params);
ProcessPendingMessages();
EXPECT_DOUBLE_EQ(kMinZoomLevel, view()->GetWebView()->zoomLevel());
@@ -1931,7 +1931,7 @@
ZoomFactorToZoomLevel(1.0));
params.url = GURL("data:text/html,max_zoomlimit_test");
view()->OnSetZoomLevelForLoadingURL(params.url, kMaxZoomLevel);
- view()->OnNavigate(params);
+ frame()->OnNavigate(params);
ProcessPendingMessages();
EXPECT_DOUBLE_EQ(kMaxZoomLevel, view()->GetWebView()->zoomLevel());
}
@@ -1991,16 +1991,16 @@
LoadHTML("hello <iframe srcdoc='fail' name='frame'></iframe>");
// Navigate the frame only.
- ViewMsg_Navigate_Params nav_params;
+ FrameMsg_Navigate_Params nav_params;
nav_params.url = GURL("data:text/html,world");
- nav_params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
nav_params.transition = PAGE_TRANSITION_TYPED;
nav_params.current_history_list_length = 1;
nav_params.current_history_list_offset = 0;
nav_params.pending_history_list_offset = 1;
nav_params.page_id = -1;
nav_params.frame_to_navigate = "frame";
- view()->OnNavigate(nav_params);
+ frame()->OnNavigate(nav_params);
ProcessPendingMessages();
// Copy the document content to std::wstring and compare with the
@@ -2074,6 +2074,10 @@
return static_cast<RenderViewImpl*>(view_);
}
+ RenderFrameImpl* frame() {
+ return static_cast<RenderFrameImpl*>(view()->GetMainRenderFrame());
+ }
+
private:
class TestContentRendererClient : public ContentRendererClient {
public:
@@ -2113,11 +2117,11 @@
// Start a load that will reach provisional state synchronously,
// but won't complete synchronously.
- ViewMsg_Navigate_Params params;
+ FrameMsg_Navigate_Params params;
params.page_id = -1;
- params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
params.url = GURL("data:text/html,test data");
- view()->OnNavigate(params);
+ frame()->OnNavigate(params);
// An error occurred.
view()->main_render_frame()->didFailProvisionalLoad(web_frame, error);
@@ -2141,11 +2145,11 @@
// Start a load that will reach provisional state synchronously,
// but won't complete synchronously.
- ViewMsg_Navigate_Params params;
+ FrameMsg_Navigate_Params params;
params.page_id = -1;
- params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
+ params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
params.url = GURL("data:text/html,test data");
- view()->OnNavigate(params);
+ frame()->OnNavigate(params);
// An error occurred.
view()->main_render_frame()->didFailProvisionalLoad(web_frame, error);
« no previous file with comments | « trunk/src/content/renderer/render_frame_impl.cc ('k') | trunk/src/content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698