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 ff3c1382cf72be50421641755221f429c984fe8d..23c965e8b453c67623692f4e3641cc412c00674a 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.cc |
+++ b/content/browser/frame_host/render_frame_host_impl.cc |
@@ -142,8 +142,8 @@ RenderFrameHost* RenderFrameHost::FromID(int render_process_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( |
@@ -151,13 +151,12 @@ RenderFrameHostImpl* RenderFrameHostImpl::FromID( |
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), |
@@ -166,6 +165,7 @@ RenderFrameHostImpl::RenderFrameHostImpl( |
frame_tree_node_(frame_tree_node), |
routing_id_(routing_id), |
is_swapped_out_(is_swapped_out), |
+ renderer_initialized_(false), |
weak_ptr_factory_(this) { |
frame_tree_->RegisterRenderFrameHost(this); |
GetProcess()->AddRoute(routing_id_, this); |
@@ -273,7 +273,10 @@ bool RenderFrameHostImpl::Send(IPC::Message* message) { |
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); |
} |
@@ -445,6 +448,29 @@ gfx::NativeViewAccessible |
return NULL; |
} |
+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()); |
+ |
+ 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_); |
} |
@@ -877,7 +903,6 @@ void RenderFrameHostImpl::OnUpdateEncoding(const std::string& encoding_name) { |
delegate_->UpdateEncoding(this, encoding_name); |
} |
- |
void RenderFrameHostImpl::OnBeginNavigation( |
const FrameHostMsg_BeginNavigation_Params& params) { |
#if defined(USE_BROWSER_SIDE_NAVIGATION) |
@@ -890,7 +915,6 @@ void RenderFrameHostImpl::OnAccessibilityEvents( |
RenderWidgetHostViewBase* view = static_cast<RenderWidgetHostViewBase*>( |
render_view_host_->GetView()); |
- |
AccessibilityMode accessibility_mode = delegate_->GetAccessibilityMode(); |
if ((accessibility_mode != AccessibilityModeOff) && view && |
RenderViewHostImpl::IsRVHStateActive(render_view_host_->rvh_state())) { |