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

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: Another improvement to 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:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 7f2172b76eafde1f96ae015c7bbe1a412344aa27..cbca1adcfe14831f22cc781c2a1c11900ecb6a63 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3417,7 +3417,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) {
Charlie Reis 2013/05/23 21:53:33 It's hard to tell whether this fix is correct, sin
nasko 2013/09/20 21:25:39 This is now completely rewritten.
// 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(
« chrome/browser/errorpage_browsertest.cc ('K') | « chrome/browser/errorpage_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698