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

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2741313002: Renamed WasWithinSamePage to WasWithinSameDocument. (Closed)
Patch Set: Even moar fixes Created 3 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
Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index b6086a04aecf9b994912f9ece06ffcad50fa5b49..74ac2a261f68923d8c6d7ddc6e9d8945810ebcaa 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -1309,7 +1309,7 @@ void RenderFrameHostImpl::OnDidCommitProvisionalLoad(const IPC::Message& msg) {
// situation) then we clear it after a while anyway.
// See https://crbug.com/497588.
if (frame_tree_node_->IsMainFrame() && GetView() &&
- !validated_params.was_within_same_page) {
+ !validated_params.was_within_same_document) {
RenderWidgetHostImpl::From(GetView()->GetRenderWidgetHost())
->StartNewContentRenderingTimeout(validated_params.content_source_id);
}
@@ -3376,7 +3376,7 @@ RenderFrameHostImpl::TakeNavigationHandleForCommit(
const FrameHostMsg_DidCommitProvisionalLoad_Params& params) {
bool is_browser_initiated = (params.nav_entry_id != 0);
- if (params.was_within_same_page) {
+ if (params.was_within_same_document) {
if (IsBrowserSideNavigationEnabled()) {
// When browser-side navigation is enabled, a NavigationHandle is created
// for browser-initiated same-document navigation. Try to take it if it's
@@ -3411,7 +3411,7 @@ RenderFrameHostImpl::TakeNavigationHandleForCommit(
return NavigationHandleImpl::Create(
params.url, params.redirects, frame_tree_node_, is_renderer_initiated,
- params.was_within_same_page, base::TimeTicks::Now(),
+ params.was_within_same_document, base::TimeTicks::Now(),
pending_nav_entry_id, false); // started_from_context_menu
}
@@ -3463,7 +3463,7 @@ RenderFrameHostImpl::TakeNavigationHandleForCommit(
// navigation loaded via LoadDataWithBaseURL, propagate the entry id.
return NavigationHandleImpl::Create(
params.url, params.redirects, frame_tree_node_, is_renderer_initiated,
- params.was_within_same_page, base::TimeTicks::Now(),
+ params.was_within_same_document, base::TimeTicks::Now(),
entry_id_for_data_nav, false); // started_from_context_menu
}

Powered by Google App Engine
This is Rietveld 408576698