Clean up some detach logic in RenderFrameImpl.

content/renderer/render_frame_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 2154 matching lines @@
   // We only notify the browser process when the frame is being detached for
   // removal. If the frame is being detached for swap, we don't need to do this
   // since we are not modifiying the frame tree.
   if (type == DetachType::Remove)
     Send(new FrameHostMsg_Detach(routing_id_));
 
   // The |is_detaching_| flag disables Send(). FrameHostMsg_Detach must be
   // sent before setting |is_detaching_| to true.
   is_detaching_ = true;
 
+  if (render_widget_)
+    render_widget_->UnregisterRenderFrame(this);
+
   // We need to clean up subframes by removing them from the map and deleting
   // the RenderFrameImpl.  In contrast, the main frame is owned by its
   // containing RenderViewHost (so that they have the same lifetime), so only
   // removal from the map is needed and no deletion.
   FrameMap::iterator it = g_frame_map.Get().find(frame);
   CHECK(it != g_frame_map.Get().end());
   CHECK_EQ(it->second, this);
   g_frame_map.Get().erase(it);
 
-  if (is_subframe_) {
-    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kSitePerProcess) && render_widget_) {
-      render_widget_->UnregisterRenderFrame(this);
-    }
-
-    // Only remove the frame from the renderer's frame tree if the frame is
-    // being detached for removal. For swaps, WebFrame::swap already takes care
-    // of replacing the frame with a RemoteFrame.
-    if (type == DetachType::Remove)
-      frame->parent()->removeChild(frame);
-  }
+  // Only remove the frame from the renderer's frame tree if the frame is
+  // being detached for removal. In the case of a swap, the frame needs to
+  // remain in the tree so WebFrame::swap() can replace it with the new frame.
+  if (is_subframe_ && type == DetachType::Remove)
+    frame->parent()->removeChild(frame);
 
   // |frame| is invalid after here.  Be sure to clear frame_ as well, since this
   // object may not be deleted immediately and other methods may try to access
   // it.
   frame->close();
   frame_ = nullptr;
 
   delete this;
   // Object is invalid after this point.
 }
@@ skipping 2820 matching lines @@
 void RenderFrameImpl::RegisterMojoServices() {
   // Only main frame have ImageDownloader service.
   if (!frame_->parent()) {
     GetServiceRegistry()->AddService<image_downloader::ImageDownloader>(
         base::Bind(&ImageDownloaderImpl::CreateMojoService,
                    base::Unretained(this)));
   }
 }
 
 }  // namespace content