diff options
| author | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 08:15:24 +0000 |
|---|---|---|
| committer | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 08:15:24 +0000 |
| commit | c8884db174f04db3f766da5d3caadbd2432c6f84 (patch) | |
| tree | e359a5bad7fdde7b6cae27836498cf14e3926fee /content | |
| parent | 04c7d07c3881b5eb0e2d3f4175b9fc60df30e5fe (diff) | |
| download | chromium_src-c8884db174f04db3f766da5d3caadbd2432c6f84.zip chromium_src-c8884db174f04db3f766da5d3caadbd2432c6f84.tar.gz chromium_src-c8884db174f04db3f766da5d3caadbd2432c6f84.tar.bz2 | |
Move frame_to_announce to be assigned later in CreateRenderFrame.
We shouldn't be dispatching RenderFrameCreated for swapped out frames.
BUG=378889
Review URL: https://codereview.chromium.org/301973006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273764 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/frame_host/render_frame_host_manager.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc index 3fa8edd..0c219d1 100644 --- a/content/browser/frame_host/render_frame_host_manager.cc +++ b/content/browser/frame_host/render_frame_host_manager.cc @@ -964,7 +964,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. @@ -988,6 +987,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. |