| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 45af122ebd019a7bda02e43c5c6db14c90bf0b4d..3699f4c085c781a9bf29b55abc6d1bd2baa13f38 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -2063,7 +2063,7 @@ void RenderFrameImpl::didCommitProvisionalLoad(
|
| // new navigation.
|
| navigation_state->set_request_committed(true);
|
|
|
| - UpdateURL(frame);
|
| + SendDidCommitProvisionalLoad(frame);
|
|
|
| // Check whether we have new encoding name.
|
| UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
|
| @@ -2988,7 +2988,7 @@ bool RenderFrameImpl::IsHidden() {
|
| }
|
|
|
| // Tell the embedding application that the URL of the active page has changed.
|
| -void RenderFrameImpl::UpdateURL(blink::WebFrame* frame) {
|
| +void RenderFrameImpl::SendDidCommitProvisionalLoad(blink::WebFrame* frame) {
|
| DCHECK(!frame_ || frame_ == frame);
|
| WebDataSource* ds = frame->dataSource();
|
| DCHECK(ds);
|
| @@ -3138,8 +3138,9 @@ void RenderFrameImpl::UpdateURL(blink::WebFrame* frame) {
|
| // Subframe navigation: the type depends on whether this navigation
|
| // generated a new session history entry. When they do generate a session
|
| // history entry, it means the user initiated the navigation and we should
|
| - // mark it as such. This test checks if this is the first time UpdateURL
|
| - // has been called since WillNavigateToURL was called to initiate the load.
|
| + // mark it as such. This test checks if this is the first time
|
| + // SendDidCommitProvisionalLoad has been called since WillNavigateToURL was
|
| + // called to initiate the load.
|
| if (render_view_->page_id_ > render_view_->last_page_id_sent_to_browser_)
|
| params.transition = PAGE_TRANSITION_MANUAL_SUBFRAME;
|
| else
|
|
|