Start using RenderFrameProxyHost objects.

content/browser/frame_host/render_frame_host_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/browser/frame_host/render_frame_host_impl.h"
 
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/user_metrics_action.h"
@@ skipping 117 matching lines @@
 }
 
 }  // namespace
 
 RenderFrameHost* RenderFrameHost::FromID(int render_process_id,
                                          int render_frame_id) {
   return RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
 }
 
 // static
-RenderFrameHostImpl* RenderFrameHostImpl::FromID(
-    int process_id, int routing_id) {
+RenderFrameHostImpl* RenderFrameHostImpl::FromID(int process_id,
+                                                 int routing_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   RoutingIDFrameMap* frames = g_routing_id_frame_map.Pointer();
   RoutingIDFrameMap::iterator it = frames->find(
       RenderFrameHostID(process_id, routing_id));
   return it == frames->end() ? NULL : it->second;
 }
 
-RenderFrameHostImpl::RenderFrameHostImpl(
-    RenderViewHostImpl* render_view_host,
-    RenderFrameHostDelegate* delegate,
-    FrameTree* frame_tree,
-    FrameTreeNode* frame_tree_node,
-    int routing_id,
-    bool is_swapped_out)
+RenderFrameHostImpl::RenderFrameHostImpl(RenderViewHostImpl* render_view_host,
+                                         RenderFrameHostDelegate* delegate,
+                                         FrameTree* frame_tree,
+                                         FrameTreeNode* frame_tree_node,
+                                         int routing_id,
+                                         bool is_swapped_out)
     : render_view_host_(render_view_host),
       delegate_(delegate),
       cross_process_frame_connector_(NULL),
       render_frame_proxy_host_(NULL),
       frame_tree_(frame_tree),
       frame_tree_node_(frame_tree_node),
       routing_id_(routing_id),
       is_swapped_out_(is_swapped_out),
+      renderer_initialized_(false),
+      has_received_swap_out_ack_(false),
       weak_ptr_factory_(this) {
   frame_tree_->RegisterRenderFrameHost(this);
   GetProcess()->AddRoute(routing_id_, this);
   g_routing_id_frame_map.Get().insert(std::make_pair(
       RenderFrameHostID(GetProcess()->GetID(), routing_id_),
       this));
 
   if (GetProcess()->GetServiceRegistry()) {
     RenderFrameSetupPtr setup;
     GetProcess()->GetServiceRegistry()->ConnectToRemoteService(&setup);
@@ skipping 87 matching lines @@
   static_cast<RenderProcessHostImpl*>(GetProcess())->EnsureMojoActivated();
   return &service_registry_;
 }
 
 bool RenderFrameHostImpl::Send(IPC::Message* message) {
   if (IPC_MESSAGE_ID_CLASS(message->type()) == InputMsgStart) {
     return render_view_host_->input_router()->SendInput(
         make_scoped_ptr(message));
   }
 
-  if (render_view_host_->IsSwappedOut()) {
+  // Route IPCs through the RenderFrameProxyHost when in swapped out state.
+  // Note: For subframes in --site-per-process mode, we don't use swapped out
+  // RenderFrameHosts.
+  if (frame_tree_node_->IsMainFrame() && render_view_host_->IsSwappedOut()) {
     DCHECK(render_frame_proxy_host_);
     return render_frame_proxy_host_->Send(message);
   }
 
   return GetProcess()->Send(message);
 }
 
 bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
   // Filter out most IPC messages if this renderer is swapped out.
   // We still want to handle certain ACKs to keep our state consistent.
@@ skipping 64 matching lines @@
                         OnShowDesktopNotification)
     IPC_MESSAGE_HANDLER(DesktopNotificationHostMsg_Cancel,
                         OnCancelDesktopNotification)
     IPC_MESSAGE_HANDLER(FrameHostMsg_TextSurroundingSelectionResponse,
                         OnTextSurroundingSelectionResponse)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
+bool RenderFrameHostImpl::CreateRenderFrame(int parent_routing_id) {
+  TRACE_EVENT0("frame_host", "RenderFrameHostImpl::CreateRenderFrame");
+  DCHECK(!IsRenderFrameLive()) << "Creating frame twice";
+
+  // The process may (if we're sharing a process with another host that already
+  // initialized it) or may not (we have our own process or the old process
+  // crashed) have been initialized. Calling Init multiple times will be
+  // ignored, so this is safe.
+  if (!GetProcess()->Init())
+    return false;
+
+  DCHECK(GetProcess()->HasConnection());
+  DCHECK(GetProcess()->GetBrowserContext());

[ncarter (slow), 2014/07/21 20:31:56]

This doesn't look like a particularly useful DCHECK -- from what I can see, a
RPH always has a browser context. Just checking HasConnection() is fine (Init()
guarantees this)

[kenrb, 2014/07/24 17:53:53]

Removed.

+
+  renderer_initialized_ = true;
+  Send(new FrameMsg_NewFrame(routing_id_, parent_routing_id));
+
+  return true;
+}
+
+bool RenderFrameHostImpl::IsRenderFrameLive() {
+  return GetProcess()->HasConnection() && renderer_initialized_;
+}
+
 void RenderFrameHostImpl::Init() {
   GetProcess()->ResumeRequestsForView(routing_id_);
 }
 
 void RenderFrameHostImpl::OnAddMessageToConsole(
     int32 level,
     const base::string16& message,
     int32 line_no,
     const base::string16& source_id) {
   if (delegate_->AddMessageToConsole(level, message, line_no, source_id))
@@ skipping 191 matching lines @@
 
     render_view_host_->SetState(
         RenderViewHostImpl::STATE_WAITING_FOR_UNLOAD_ACK);
     render_view_host_->unload_event_monitor_timeout_->Start(
         base::TimeDelta::FromMilliseconds(
             RenderViewHostImpl::kUnloadTimeoutMS));
   }
 
   set_render_frame_proxy_host(proxy);
 
-  if (render_view_host_->IsRenderViewLive())
+  if (render_view_host_->IsRenderViewLive()) {
+    has_received_swap_out_ack_ = false;
     Send(new FrameMsg_SwapOut(routing_id_, proxy->GetRoutingID()));
+  }
 
   if (!GetParent())
     delegate_->SwappedOut(this);
 
   // Allow the navigation to proceed.
   frame_tree_node_->render_manager()->SwappedOut(this);
 }
 
 void RenderFrameHostImpl::OnBeforeUnloadACK(
     bool proceed,
@@ skipping 46 matching lines @@
   frame_tree_node_->render_manager()->OnBeforeUnloadACK(
       render_view_host_->unload_ack_is_for_cross_site_transition_, proceed,
       before_unload_end_time);
 
   // If canceled, notify the delegate to cancel its pending navigation entry.
   if (!proceed)
     render_view_host_->GetDelegate()->DidCancelLoading();
 }
 
 void RenderFrameHostImpl::OnSwapOutACK() {
+  has_received_swap_out_ack_ = true;
   OnSwappedOut(false);
 }
 
 void RenderFrameHostImpl::OnSwappedOut(bool timed_out) {
   // For now, we only need to update the RVH state machine for top-level swaps.
   // Subframe swaps (in --site-per-process) can just continue via RFHM.
   if (!GetParent())
     render_view_host_->OnSwappedOut(timed_out);
   else
     frame_tree_node_->render_manager()->SwappedOut(this);
@@ skipping 310 matching lines @@
       FROM_HERE,
       base::Bind(
           &TransitionRequestManager::SetHasPendingTransitionRequest,
           base::Unretained(TransitionRequestManager::GetInstance()),
           GetProcess()->GetID(),
           routing_id_,
           has_pending_request));
 }
 
 }  // namespace content