Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 6a3f713f432a8b9a6e685f1c389d7ace1120486c..1c950566a65f793c3548af7141e561ee21537e8e 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -3627,7 +3627,7 @@ void RenderFrameImpl::didCommitProvisionalLoad( |
// Only update the PreviewsState and effective connection type states for new |
// main frame documents. Subframes inherit from the main frame and should not |
// change at commit time. |
- if (is_main_frame_ && !navigation_state->WasWithinSamePage()) { |
+ if (is_main_frame_ && !navigation_state->WasWithinSameDocument()) { |
previews_state_ = |
extra_data ? extra_data->previews_state() : PREVIEWS_OFF; |
@@ -3654,9 +3654,10 @@ void RenderFrameImpl::didCommitProvisionalLoad( |
return; |
} |
- // For new page navigations, the browser process needs to be notified of the |
- // first paint of that page, so it can cancel the timer that waits for it. |
- if (is_main_frame_ && !navigation_state->WasWithinSamePage()) { |
+ // For navigations that change the document, the browser process needs to be |
+ // notified of the first paint of that page, so it can cancel the timer that |
+ // waits for it. |
+ if (is_main_frame_ && !navigation_state->WasWithinSameDocument()) { |
GetRenderWidget()->IncrementContentSourceId(); |
render_view_->QueueMessage( |
new ViewHostMsg_DidFirstPaintAfterLoad(render_view_->routing_id_), |
@@ -3707,8 +3708,8 @@ void RenderFrameImpl::didCommitProvisionalLoad( |
for (auto& observer : render_view_->observers_) |
observer.DidCommitProvisionalLoad(frame, is_new_navigation); |
for (auto& observer : observers_) { |
- observer.DidCommitProvisionalLoad(is_new_navigation, |
- navigation_state->WasWithinSamePage()); |
+ observer.DidCommitProvisionalLoad( |
+ is_new_navigation, navigation_state->WasWithinSameDocument()); |
} |
if (!frame->parent()) { // Only for top frames. |
@@ -4046,7 +4047,7 @@ void RenderFrameImpl::didNavigateWithinPage( |
UpdateNavigationState(document_state, true /* was_within_same_page */, |
content_initiated); |
static_cast<NavigationStateImpl*>(document_state->navigation_state()) |
- ->set_was_within_same_page(true); |
+ ->set_was_within_same_document(true); |
didCommitProvisionalLoad(frame, item, commit_type); |
} |
@@ -4852,7 +4853,7 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad( |
params.render_view_routing_id = render_view_->routing_id(); |
params.socket_address.set_host(response.remoteIPAddress().utf8()); |
params.socket_address.set_port(response.remotePort()); |
- params.was_within_same_page = navigation_state->WasWithinSamePage(); |
+ params.was_within_same_document = navigation_state->WasWithinSameDocument(); |
WebDocument frame_document = frame->document(); |
// Set the origin of the frame. This will be replicated to the corresponding |
@@ -5015,7 +5016,7 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad( |
base::IntToString(params.redirects.size())); |
base::debug::SetCrashKeyValue( |
"origin_mismatch_same_page", |
- base::IntToString(params.was_within_same_page)); |
+ base::IntToString(params.was_within_same_document)); |
CHECK(params.origin.IsSamePhysicalOriginWith(url::Origin(params.url))) |
<< " url:" << params.url << " origin:" << params.origin; |
} |