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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2140393002: Don't clear pending NavigationParams until didStopLoading. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fix. Created 4 years, 5 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
« no previous file with comments | « chrome/browser/printing/print_preview_dialog_controller_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index d2030c35e017a83ed17e6526dbb2907d173b90c1..fa0982ffd03066d54fc0b0573dbd5cfb087197b4 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4827,6 +4827,9 @@ void RenderFrameImpl::didStopLoading() {
"id", routing_id_);
render_view_->FrameDidStopLoading(frame_);
Send(new FrameHostMsg_DidStopLoading(routing_id_));
+
+ // Clear any pending NavigationParams if they didn't get used.
+ pending_navigation_params_.reset();
}
void RenderFrameImpl::didChangeLoadProgress(double load_progress) {
@@ -5668,9 +5671,6 @@ void RenderFrameImpl::NavigateInternal(
if (!frame_->isLoading() && !has_history_navigation_in_frame)
Send(new FrameHostMsg_DidStopLoading(routing_id_));
}
-
- // In case LoadRequest failed before didCreateDataSource was called.
- pending_navigation_params_.reset();
}
void RenderFrameImpl::UpdateEncoding(WebFrame* frame,
« no previous file with comments | « chrome/browser/printing/print_preview_dialog_controller_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698