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

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

Issue 1425823002: (DEPRECATED) Send navigation_start to browser process in DidStartProvisionalLoad (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Stop calling didCreateDataSource for same-page navs 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
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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 } 91 }
92 92
93 void TestRenderFrameHost::SimulateNavigationStart(const GURL& url) { 93 void TestRenderFrameHost::SimulateNavigationStart(const GURL& url) {
94 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 94 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
95 switches::kEnableBrowserSideNavigation)) { 95 switches::kEnableBrowserSideNavigation)) {
96 SendRendererInitiatedNavigationRequest(url, false); 96 SendRendererInitiatedNavigationRequest(url, false);
97 return; 97 return;
98 } 98 }
99 99
100 OnDidStartLoading(true); 100 OnDidStartLoading(true);
101 OnDidStartProvisionalLoadForFrame(url); 101 OnDidStartProvisionalLoadForFrame(url, base::TimeTicks::Now());
102 } 102 }
103 103
104 void TestRenderFrameHost::SimulateRedirect(const GURL& new_url) { 104 void TestRenderFrameHost::SimulateRedirect(const GURL& new_url) {
105 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 105 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
106 switches::kEnableBrowserSideNavigation)) { 106 switches::kEnableBrowserSideNavigation)) {
107 NavigationRequest* request = frame_tree_node_->navigation_request(); 107 NavigationRequest* request = frame_tree_node_->navigation_request();
108 TestNavigationURLLoader* url_loader = 108 TestNavigationURLLoader* url_loader =
109 static_cast<TestNavigationURLLoader*>(request->loader_for_testing()); 109 static_cast<TestNavigationURLLoader*>(request->loader_for_testing());
110 CHECK(url_loader); 110 CHECK(url_loader);
111 url_loader->SimulateServerRedirect(new_url); 111 url_loader->SimulateServerRedirect(new_url);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 171
172 FrameHostMsg_DidFailProvisionalLoadWithError_Params error_params; 172 FrameHostMsg_DidFailProvisionalLoadWithError_Params error_params;
173 error_params.error_code = error_code; 173 error_params.error_code = error_code;
174 error_params.url = url; 174 error_params.url = url;
175 OnDidFailProvisionalLoadWithError(error_params); 175 OnDidFailProvisionalLoadWithError(error_params);
176 } 176 }
177 177
178 void TestRenderFrameHost::SimulateNavigationErrorPageCommit() { 178 void TestRenderFrameHost::SimulateNavigationErrorPageCommit() {
179 CHECK(navigation_handle()); 179 CHECK(navigation_handle());
180 GURL error_url = GURL(kUnreachableWebDataURL); 180 GURL error_url = GURL(kUnreachableWebDataURL);
181 OnDidStartProvisionalLoadForFrame(error_url); 181 OnDidStartProvisionalLoadForFrame(error_url, base::TimeTicks::Now());
182 FrameHostMsg_DidCommitProvisionalLoad_Params params; 182 FrameHostMsg_DidCommitProvisionalLoad_Params params;
183 params.page_id = ComputeNextPageID(); 183 params.page_id = ComputeNextPageID();
184 params.nav_entry_id = 0; 184 params.nav_entry_id = 0;
185 params.did_create_new_entry = true; 185 params.did_create_new_entry = true;
186 params.url = navigation_handle()->GetURL(); 186 params.url = navigation_handle()->GetURL();
187 params.transition = GetParent() ? ui::PAGE_TRANSITION_MANUAL_SUBFRAME 187 params.transition = GetParent() ? ui::PAGE_TRANSITION_MANUAL_SUBFRAME
188 : ui::PAGE_TRANSITION_LINK; 188 : ui::PAGE_TRANSITION_LINK;
189 params.was_within_same_page = false; 189 params.was_within_same_page = false;
190 params.url_is_unreachable = true; 190 params.url_is_unreachable = true;
191 params.page_state = PageState::CreateForTesting(navigation_handle()->GetURL(), 191 params.page_state = PageState::CreateForTesting(navigation_handle()->GetURL(),
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 int nav_entry_id, 260 int nav_entry_id,
261 bool did_create_new_entry, 261 bool did_create_new_entry,
262 const GURL& url, 262 const GURL& url,
263 ui::PageTransition transition, 263 ui::PageTransition transition,
264 int response_code, 264 int response_code,
265 const ModificationCallback& callback) { 265 const ModificationCallback& callback) {
266 // DidStartProvisionalLoad may delete the pending entry that holds |url|, 266 // DidStartProvisionalLoad may delete the pending entry that holds |url|,
267 // so we keep a copy of it to use below. 267 // so we keep a copy of it to use below.
268 GURL url_copy(url); 268 GURL url_copy(url);
269 OnDidStartLoading(true); 269 OnDidStartLoading(true);
270 OnDidStartProvisionalLoadForFrame(url_copy); 270 OnDidStartProvisionalLoadForFrame(url_copy, base::TimeTicks::Now());
271 271
272 FrameHostMsg_DidCommitProvisionalLoad_Params params; 272 FrameHostMsg_DidCommitProvisionalLoad_Params params;
273 params.page_id = page_id; 273 params.page_id = page_id;
274 params.nav_entry_id = nav_entry_id; 274 params.nav_entry_id = nav_entry_id;
275 params.url = url_copy; 275 params.url = url_copy;
276 params.transition = transition; 276 params.transition = transition;
277 params.should_update_history = true; 277 params.should_update_history = true;
278 params.did_create_new_entry = did_create_new_entry; 278 params.did_create_new_entry = did_create_new_entry;
279 params.gesture = NavigationGestureUser; 279 params.gesture = NavigationGestureUser;
280 params.contents_mime_type = contents_mime_type_; 280 params.contents_mime_type = contents_mime_type_;
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 // cleared during DidFailProvisionalLoad). 402 // cleared during DidFailProvisionalLoad).
403 int page_id = entry ? entry->GetPageID() : -1; 403 int page_id = entry ? entry->GetPageID() : -1;
404 if (page_id == -1) { 404 if (page_id == -1) {
405 WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(delegate()); 405 WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(delegate());
406 page_id = web_contents->GetMaxPageIDForSiteInstance(GetSiteInstance()) + 1; 406 page_id = web_contents->GetMaxPageIDForSiteInstance(GetSiteInstance()) + 1;
407 } 407 }
408 return page_id; 408 return page_id;
409 } 409 }
410 410
411 } // namespace content 411 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698