content/renderer/render_view_impl.cc - Issue 15294012: Fix initial erroneous navigation in iframe to not add history entry.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_view_impl.cc

Issue 15294012: Fix initial erroneous navigation in iframe to not add history entry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Removing logs and fixing up the test. Created 7 years, 7 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:

Index: content/renderer/render_view_impl.cc

diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc

index dc5a923125c1755b520c0835501f71b9a0353dec..e1638b3b216173e552cbbaeb351253d33b0c428c 100644

--- a/content/renderer/render_view_impl.cc

+++ b/content/renderer/render_view_impl.cc

@@ -3412,7 +3412,8 @@ void RenderViewImpl::didStartProvisionalLoad(WebFrame* frame) {

// Make sure redirect tracking state is clear for the new load.

completed_client_redirect_src_ = Referrer();

- } else if (frame->parent()->isLoading()) {

+ } else if (frame->parent()->isLoading() ||

+ document_state->navigation_state()->pending_page_id() == -1) {

// Take note of AUTO_SUBFRAME loads here, so that we can know how to

// load an error page. See didFailProvisionalLoad.

document_state->navigation_state()->set_transition_type(