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

Side by Side Diff: content/test/test_render_frame_host.cc

Issue 1427633004: Send navigation_start to the browser in DidStartProvisionalLoad IPC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@navigation_start_renderer
Patch Set: Conflict Resolution: FrameHostMsg_DidStartProvisionalLoad Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/test/test_render_frame_host.h" 5 #include "content/test/test_render_frame_host.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "content/browser/frame_host/frame_tree.h" 8 #include "content/browser/frame_host/frame_tree.h"
9 #include "content/browser/frame_host/navigation_handle_impl.h" 9 #include "content/browser/frame_host/navigation_handle_impl.h"
10 #include "content/browser/frame_host/navigation_request.h" 10 #include "content/browser/frame_host/navigation_request.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 } 92 }
93 93
94 void TestRenderFrameHost::SimulateNavigationStart(const GURL& url) { 94 void TestRenderFrameHost::SimulateNavigationStart(const GURL& url) {
95 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 95 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
96 switches::kEnableBrowserSideNavigation)) { 96 switches::kEnableBrowserSideNavigation)) {
97 SendRendererInitiatedNavigationRequest(url, false); 97 SendRendererInitiatedNavigationRequest(url, false);
98 return; 98 return;
99 } 99 }
100 100
101 OnDidStartLoading(true); 101 OnDidStartLoading(true);
102 OnDidStartProvisionalLoad(url); 102 OnDidStartProvisionalLoad(url, base::TimeTicks::Now());
103 } 103 }
104 104
105 void TestRenderFrameHost::SimulateRedirect(const GURL& new_url) { 105 void TestRenderFrameHost::SimulateRedirect(const GURL& new_url) {
106 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 106 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
107 switches::kEnableBrowserSideNavigation)) { 107 switches::kEnableBrowserSideNavigation)) {
108 NavigationRequest* request = frame_tree_node_->navigation_request(); 108 NavigationRequest* request = frame_tree_node_->navigation_request();
109 TestNavigationURLLoader* url_loader = 109 TestNavigationURLLoader* url_loader =
110 static_cast<TestNavigationURLLoader*>(request->loader_for_testing()); 110 static_cast<TestNavigationURLLoader*>(request->loader_for_testing());
111 CHECK(url_loader); 111 CHECK(url_loader);
112 url_loader->SimulateServerRedirect(new_url); 112 url_loader->SimulateServerRedirect(new_url);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 172
173 FrameHostMsg_DidFailProvisionalLoadWithError_Params error_params; 173 FrameHostMsg_DidFailProvisionalLoadWithError_Params error_params;
174 error_params.error_code = error_code; 174 error_params.error_code = error_code;
175 error_params.url = url; 175 error_params.url = url;
176 OnDidFailProvisionalLoadWithError(error_params); 176 OnDidFailProvisionalLoadWithError(error_params);
177 } 177 }
178 178
179 void TestRenderFrameHost::SimulateNavigationErrorPageCommit() { 179 void TestRenderFrameHost::SimulateNavigationErrorPageCommit() {
180 CHECK(navigation_handle()); 180 CHECK(navigation_handle());
181 GURL error_url = GURL(kUnreachableWebDataURL); 181 GURL error_url = GURL(kUnreachableWebDataURL);
182 OnDidStartProvisionalLoad(error_url); 182 OnDidStartProvisionalLoad(error_url, base::TimeTicks::Now());
183 FrameHostMsg_DidCommitProvisionalLoad_Params params; 183 FrameHostMsg_DidCommitProvisionalLoad_Params params;
184 params.page_id = ComputeNextPageID(); 184 params.page_id = ComputeNextPageID();
185 params.nav_entry_id = 0; 185 params.nav_entry_id = 0;
186 params.did_create_new_entry = true; 186 params.did_create_new_entry = true;
187 params.url = navigation_handle()->GetURL(); 187 params.url = navigation_handle()->GetURL();
188 params.transition = GetParent() ? ui::PAGE_TRANSITION_MANUAL_SUBFRAME 188 params.transition = GetParent() ? ui::PAGE_TRANSITION_MANUAL_SUBFRAME
189 : ui::PAGE_TRANSITION_LINK; 189 : ui::PAGE_TRANSITION_LINK;
190 params.was_within_same_page = false; 190 params.was_within_same_page = false;
191 params.url_is_unreachable = true; 191 params.url_is_unreachable = true;
192 params.page_state = PageState::CreateForTesting(navigation_handle()->GetURL(), 192 params.page_state = PageState::CreateForTesting(navigation_handle()->GetURL(),
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 int nav_entry_id, 261 int nav_entry_id,
262 bool did_create_new_entry, 262 bool did_create_new_entry,
263 const GURL& url, 263 const GURL& url,
264 ui::PageTransition transition, 264 ui::PageTransition transition,
265 int response_code, 265 int response_code,
266 const ModificationCallback& callback) { 266 const ModificationCallback& callback) {
267 // DidStartProvisionalLoad may delete the pending entry that holds |url|, 267 // DidStartProvisionalLoad may delete the pending entry that holds |url|,
268 // so we keep a copy of it to use below. 268 // so we keep a copy of it to use below.
269 GURL url_copy(url); 269 GURL url_copy(url);
270 OnDidStartLoading(true); 270 OnDidStartLoading(true);
271 OnDidStartProvisionalLoad(url_copy); 271 OnDidStartProvisionalLoad(url_copy, base::TimeTicks::Now());
272 272
273 FrameHostMsg_DidCommitProvisionalLoad_Params params; 273 FrameHostMsg_DidCommitProvisionalLoad_Params params;
274 params.page_id = page_id; 274 params.page_id = page_id;
275 params.nav_entry_id = nav_entry_id; 275 params.nav_entry_id = nav_entry_id;
276 params.url = url_copy; 276 params.url = url_copy;
277 params.transition = transition; 277 params.transition = transition;
278 params.should_update_history = true; 278 params.should_update_history = true;
279 params.did_create_new_entry = did_create_new_entry; 279 params.did_create_new_entry = did_create_new_entry;
280 params.gesture = NavigationGestureUser; 280 params.gesture = NavigationGestureUser;
281 params.contents_mime_type = contents_mime_type_; 281 params.contents_mime_type = contents_mime_type_;
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 // cleared during DidFailProvisionalLoad). 403 // cleared during DidFailProvisionalLoad).
404 int page_id = entry ? entry->GetPageID() : -1; 404 int page_id = entry ? entry->GetPageID() : -1;
405 if (page_id == -1) { 405 if (page_id == -1) {
406 WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(delegate()); 406 WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(delegate());
407 page_id = web_contents->GetMaxPageIDForSiteInstance(GetSiteInstance()) + 1; 407 page_id = web_contents->GetMaxPageIDForSiteInstance(GetSiteInstance()) + 1;
408 } 408 }
409 return page_id; 409 return page_id;
410 } 410 }
411 411
412 } // namespace content 412 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698