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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1018383002: Make NavigationParams clearer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Charlie's comments Created 5 years, 9 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
« content/common/navigation_params.h ('K') | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 88c7bd484e73f951f3597186b903a13e85e4cf77..6bddfa036193b8d20e882a9b7bb16c5cfffb950e 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1067,17 +1067,16 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) {
void RenderFrameImpl::OnNavigate(
const CommonNavigationParams& common_params,
const StartNavigationParams& start_params,
- const CommitNavigationParams& commit_params,
- const HistoryNavigationParams& history_params) {
+ const RequestNavigationParams& request_params) {
TRACE_EVENT2("navigation", "RenderFrameImpl::OnNavigate", "id", routing_id_,
"url", common_params.url.possibly_invalid_spec());
bool is_reload = RenderViewImpl::IsReload(common_params.navigation_type);
- bool is_history_navigation = history_params.page_state.IsValid();
+ bool is_history_navigation = request_params.page_state.IsValid();
WebURLRequest::CachePolicy cache_policy =
WebURLRequest::UseProtocolCachePolicy;
if (!RenderFrameImpl::PrepareRenderViewForNavigation(
- common_params.url, is_history_navigation, history_params, &is_reload,
+ common_params.url, is_history_navigation, request_params, &is_reload,
&cache_policy)) {
Send(new FrameHostMsg_DidDropNavigation(routing_id_));
return;
@@ -1086,12 +1085,12 @@ void RenderFrameImpl::OnNavigate(
GetContentClient()->SetActiveURL(common_params.url);
WebFrame* frame = frame_;
- if (!commit_params.frame_to_navigate.empty()) {
+ if (!request_params.frame_to_navigate.empty()) {
// TODO(nasko): Move this lookup to the browser process.
frame = render_view_->webview()->findFrameByName(
- WebString::fromUTF8(commit_params.frame_to_navigate));
+ WebString::fromUTF8(request_params.frame_to_navigate));
CHECK(frame) << "Invalid frame name passed: "
- << commit_params.frame_to_navigate;
+ << request_params.frame_to_navigate;
}
if (is_reload && !render_view_->history_controller()->GetCurrentEntry()) {
@@ -1101,8 +1100,8 @@ void RenderFrameImpl::OnNavigate(
cache_policy = WebURLRequest::ReloadIgnoringCacheData;
}
- render_view_->pending_navigation_params_.reset(new NavigationParams(
- common_params, start_params, commit_params, history_params));
+ render_view_->pending_navigation_params_.reset(
+ new NavigationParams(common_params, start_params, request_params));
// If we are reloading, then WebKit will use the history state of the current
// page, so we should just ignore any given history state. Otherwise, if we
@@ -1121,9 +1120,9 @@ void RenderFrameImpl::OnNavigate(
frame->reload(ignore_cache);
} else if (is_history_navigation) {
// We must know the page ID of the page we are navigating back to.
- DCHECK_NE(history_params.page_id, -1);
+ DCHECK_NE(request_params.page_id, -1);
scoped_ptr<HistoryEntry> entry =
- PageStateToHistoryEntry(history_params.page_state);
+ PageStateToHistoryEntry(request_params.page_state);
if (entry) {
// Ensure we didn't save the swapped out URL in UpdateState, since the
// browser should never be telling us to navigate to swappedout://.
@@ -1165,14 +1164,14 @@ void RenderFrameImpl::OnNavigate(
}
// A session history navigation should have been accompanied by state.
- CHECK_EQ(history_params.page_id, -1);
+ CHECK_EQ(request_params.page_id, -1);
// Record this before starting the load, we need a lower bound of this time
// to sanitize the navigationStart override set below.
base::TimeTicks renderer_navigation_start = base::TimeTicks::Now();
frame->loadRequest(request);
- UpdateFrameNavigationTiming(frame, commit_params.browser_navigation_start,
+ UpdateFrameNavigationTiming(frame, request_params.browser_navigation_start,
renderer_navigation_start);
}
@@ -2472,7 +2471,7 @@ void RenderFrameImpl::didFailProvisionalLoad(blink::WebLocalFrame* frame,
// TODO(davidben): This should also take the failed navigation's replacement
// state into account, if a location.replace() failed.
bool replace =
- navigation_state->history_params().page_id != -1 ||
+ navigation_state->request_params().page_id != -1 ||
ui::PageTransitionCoreTypeIs(navigation_state->GetTransitionType(),
ui::PAGE_TRANSITION_AUTO_SUBFRAME);
@@ -2481,10 +2480,9 @@ void RenderFrameImpl::didFailProvisionalLoad(blink::WebLocalFrame* frame,
if (!navigation_state->IsContentInitiated()) {
render_view_->pending_navigation_params_.reset(new NavigationParams(
navigation_state->common_params(), navigation_state->start_params(),
- CommitNavigationParams(false, base::TimeTicks(), std::vector<GURL>(),
- false, std::string(),
- document_state->request_time()),
- navigation_state->history_params()));
+ navigation_state->request_params()));
+ render_view_->pending_navigation_params_->request_params.request_time =
+ document_state->request_time();
}
// Load an error page.
@@ -2567,14 +2565,14 @@ void RenderFrameImpl::didCommitProvisionalLoad(
// Note that we need to check if the page ID changed. In the case of a
// reload, the page ID doesn't change, and UpdateSessionHistory gets the
// previous URL and the current page ID, which would be wrong.
- if (navigation_state->history_params().page_id != -1 &&
- navigation_state->history_params().page_id != render_view_->page_id_ &&
+ if (navigation_state->request_params().page_id != -1 &&
+ navigation_state->request_params().page_id != render_view_->page_id_ &&
!navigation_state->request_committed()) {
// This is a successful session history navigation!
- render_view_->page_id_ = navigation_state->history_params().page_id;
+ render_view_->page_id_ = navigation_state->request_params().page_id;
render_view_->history_list_offset_ =
- navigation_state->history_params().pending_history_list_offset;
+ navigation_state->request_params().pending_history_list_offset;
}
}
@@ -3872,7 +3870,7 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(
params.original_request_url = GetOriginalRequestURL(ds);
params.history_list_was_cleared =
- navigation_state->history_params().should_clear_history_list;
+ navigation_state->request_params().should_clear_history_list;
params.report_type = static_cast<FrameMsg_UILoadMetricsReportType::Value>(
frame->dataSource()->request().inputPerfMetricReportPolicy());
@@ -3899,7 +3897,7 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(
else
params.transition = ui::PAGE_TRANSITION_AUTO_SUBFRAME;
- DCHECK(!navigation_state->history_params().should_clear_history_list);
+ DCHECK(!navigation_state->request_params().should_clear_history_list);
params.history_list_was_cleared = false;
params.report_type = FrameMsg_UILoadMetricsReportType::NO_REPORT;
@@ -3951,16 +3949,15 @@ void RenderFrameImpl::OnCommitNavigation(
const ResourceResponseHead& response,
const GURL& stream_url,
const CommonNavigationParams& common_params,
- const CommitNavigationParams& commit_params,
- const HistoryNavigationParams& history_params) {
+ const RequestNavigationParams& request_params) {
CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableBrowserSideNavigation));
bool is_reload = false;
- bool is_history_navigation = history_params.page_state.IsValid();
+ bool is_history_navigation = request_params.page_state.IsValid();
WebURLRequest::CachePolicy cache_policy =
WebURLRequest::UseProtocolCachePolicy;
if (!RenderFrameImpl::PrepareRenderViewForNavigation(
- common_params.url, is_history_navigation, history_params, &is_reload,
+ common_params.url, is_history_navigation, request_params, &is_reload,
&cache_policy)) {
return;
}
@@ -3968,7 +3965,7 @@ void RenderFrameImpl::OnCommitNavigation(
GetContentClient()->SetActiveURL(common_params.url);
render_view_->pending_navigation_params_.reset(new NavigationParams(
- common_params, StartNavigationParams(), commit_params, history_params));
+ common_params, StartNavigationParams(), request_params));
if (!common_params.base_url_for_data_url.is_empty() ||
common_params.url.SchemeIs(url::kDataScheme)) {
@@ -3998,9 +3995,8 @@ void RenderFrameImpl::OnCommitNavigation(
// to sanitize the navigationStart override set below.
base::TimeTicks renderer_navigation_start = base::TimeTicks::Now();
frame_->loadRequest(request);
- UpdateFrameNavigationTiming(
- frame_, commit_params.browser_navigation_start,
- renderer_navigation_start);
+ UpdateFrameNavigationTiming(frame_, request_params.browser_navigation_start,
+ renderer_navigation_start);
}
WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
@@ -4395,7 +4391,7 @@ RenderFrameImpl::CreateRendererFactory() {
bool RenderFrameImpl::PrepareRenderViewForNavigation(
const GURL& url,
bool is_history_navigation,
- const HistoryNavigationParams& history_params,
+ const RequestNavigationParams& request_params,
bool* is_reload,
WebURLRequest::CachePolicy* cache_policy) {
MaybeHandleDebugURL(url);
@@ -4410,15 +4406,15 @@ bool RenderFrameImpl::PrepareRenderViewForNavigation(
// frame is swapped out, it won't commit before asking the browser.
if (!render_view_->is_swapped_out() && is_history_navigation &&
render_view_->history_list_offset_ !=
- history_params.current_history_list_offset) {
+ request_params.current_history_list_offset) {
return false;
}
render_view_->history_list_offset_ =
- history_params.current_history_list_offset;
+ request_params.current_history_list_offset;
render_view_->history_list_length_ =
- history_params.current_history_list_length;
- if (history_params.should_clear_history_list) {
+ request_params.current_history_list_length;
+ if (request_params.should_clear_history_list) {
CHECK_EQ(-1, render_view_->history_list_offset_);
CHECK_EQ(0, render_view_->history_list_length_);
}
« content/common/navigation_params.h ('K') | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698