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

Unified Diff: content/browser/frame_host/render_frame_host_manager.cc

Issue 301973006: Move frame_to_announce to be assigned later in CreateRenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 29e6052fabb48307653260efd6bc6c248f984c2c..581f55b86e88c10bf8d159c2d438186ef9e321b3 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -963,7 +963,6 @@ int RenderFrameHostManager::CreateRenderFrame(
RenderViewHostImpl* render_view_host =
new_render_frame_host->render_view_host();
int proxy_routing_id = MSG_ROUTING_NONE;
- frame_to_announce = new_render_frame_host.get();
// Prevent the process from exiting while we're trying to navigate in it.
// Otherwise, if the new RFH is swapped out already, store it.
@@ -987,6 +986,7 @@ int RenderFrameHostManager::CreateRenderFrame(
CancelPending();
}
routing_id = render_view_host->GetRoutingID();
+ frame_to_announce = new_render_frame_host.get();
}
// Use this as our new pending RFH if it isn't swapped out.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698