Commit c8884db1 authored by nasko@chromium.org's avatar nasko@chromium.org

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
parent 04c7d07c
...@@ -964,7 +964,6 @@ int RenderFrameHostManager::CreateRenderFrame( ...@@ -964,7 +964,6 @@ int RenderFrameHostManager::CreateRenderFrame(
RenderViewHostImpl* render_view_host = RenderViewHostImpl* render_view_host =
new_render_frame_host->render_view_host(); new_render_frame_host->render_view_host();
int proxy_routing_id = MSG_ROUTING_NONE; 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. // Prevent the process from exiting while we're trying to navigate in it.
// Otherwise, if the new RFH is swapped out already, store it. // Otherwise, if the new RFH is swapped out already, store it.
...@@ -988,6 +987,7 @@ int RenderFrameHostManager::CreateRenderFrame( ...@@ -988,6 +987,7 @@ int RenderFrameHostManager::CreateRenderFrame(
CancelPending(); CancelPending();
} }
routing_id = render_view_host->GetRoutingID(); 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. // Use this as our new pending RFH if it isn't swapped out.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment