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

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

Issue 663183003: Revert of Drop CreateChildFrame messages when swapping out. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2171
Patch Set: Created 6 years, 2 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/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 17c02590feb278f471a05eedca215e5832176473..585fb225282f1448ba825bd80d6f1509fe1bc9d8 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -584,17 +584,8 @@
void RenderFrameHostImpl::OnCreateChildFrame(int new_routing_id,
const std::string& frame_name) {
- // It is possible that while a new RenderFrameHost was committed, the
- // RenderFrame corresponding to this host sent an IPC message to create a
- // frame and it is delivered after this host is swapped out.
- // Ignore such messages, as we know this RenderFrameHost is going away.
- if (rfh_state_ != RenderFrameHostImpl::STATE_DEFAULT)
- return;
-
RenderFrameHostImpl* new_frame = frame_tree_->AddFrame(
- frame_tree_node_, GetProcess()->GetID(), new_routing_id, frame_name);
- if (!new_frame)
- return;
+ frame_tree_node_, new_routing_id, frame_name);
// We know that the RenderFrame has been created in this case, immediately
// after the CreateChildFrame IPC was sent.
« no previous file with comments | « content/browser/frame_host/frame_tree_unittest.cc ('k') | content/browser/frame_host/render_frame_host_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698