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

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: Fix wait bug. 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
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 1ababbbe32c6b05884bfe936730cea01f86bd89b..4b99d214b793ebede323b50c77423e6b5ae0172b 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4799,6 +4799,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) {
@@ -5639,9 +5642,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();
Avi (use Gerrit) 2016/07/16 02:29:13 OMG I hate pending params. When can we kill them e
Charlie Reis 2016/07/22 18:34:00 Yes, I would love to see them gone. I'm guessing
}
void RenderFrameImpl::UpdateEncoding(WebFrame* frame,

Powered by Google App Engine
This is Rietveld 408576698