Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index 43d74a22a2d2cfecd0401377b47c8d696772446e..07053b0a0990870600d6bccfc3cbf4153f129d16 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -286,6 +286,17 @@ WebContentsImpl::ColorChooserInfo::ColorChooserInfo(int render_process_id, |
WebContentsImpl::ColorChooserInfo::~ColorChooserInfo() { |
} |
+// WebContentsImpl::WebContentsTreeNode ---------------------------------------- |
+WebContentsImpl::WebContentsTreeNode::WebContentsTreeNode() |
+ : parent_web_contents_(nullptr) { |
+} |
+ |
+WebContentsImpl::WebContentsTreeNode::~WebContentsTreeNode() { |
+ // TODO(lazyboy): Enforce that a child WebContentsTreeNode gets deleted |
+ // before its parent. Otherwise the child could have a stale pointer to its |
+ // parent WebContents, risking a use-after-free. |
Charlie Reis
2015/05/22 23:44:31
This must be fixed before committing.
|
+} |
+ |
// WebContentsImpl ------------------------------------------------------------- |
WebContentsImpl::WebContentsImpl(BrowserContext* browser_context, |
@@ -1132,6 +1143,37 @@ void WebContentsImpl::DispatchBeforeUnload(bool for_cross_site_transition) { |
GetMainFrame()->DispatchBeforeUnload(for_cross_site_transition); |
} |
+void WebContentsImpl::AttachToOuterWebContentsFrame( |
+ WebContents* outer_web_contents, |
+ RenderFrameHost* outer_contents_frame) { |
+ CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSitePerProcess)); |
+ // Create a link to our parent WebContents. |
Charlie Reis
2015/05/22 23:44:31
outer
lazyboy
2015/05/26 16:32:55
Done.
|
+ node_.set_parent_web_contents( |
+ static_cast<WebContentsImpl*>(outer_web_contents)); |
+ |
+ DCHECK(outer_contents_frame); |
+ |
+ // Create a swapped out RVH and a proxy in our render manager, pointing |
+ // to the SiteInstance of the outer WebContents. The swapped out RVH will be |
+ // used to send postMessage to the inner WebContents. |
+ int proxy_to_outer_web_contents_routing_id = |
+ GetRenderManager()->CreateOuterContentsProxy( |
+ outer_contents_frame->GetSiteInstance()); |
+ |
+ // Swap the outer WebContents' initial frame for the inner WebContents with |
Charlie Reis
2015/05/22 23:44:31
WebContents's
lazyboy
2015/05/26 16:32:55
Done.
|
+ // the proxy we've created above. |
+ // The proxy has a CPFC and it uses the swapped out RV as its RenderWidget, |
+ // which gives us input and rendering. |
+ static_cast<RenderFrameHostImpl*>(outer_contents_frame) |
+ ->frame_tree_node() |
+ ->render_manager() |
+ ->ReplaceWithInnerContentsProxy(proxy_to_outer_web_contents_routing_id); |
+ |
+ GetRenderManager()->SetRWHViewForInnerContents( |
+ GetRenderManager()->GetRenderWidgetHostView()); |
+} |
+ |
void WebContentsImpl::Stop() { |
GetRenderManager()->Stop(); |
FOR_EACH_OBSERVER(WebContentsObserver, observers_, NavigationStopped()); |
@@ -1204,7 +1246,9 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { |
WebContentsViewDelegate* delegate = |
GetContentClient()->browser()->GetWebContentsViewDelegate(this); |
- if (browser_plugin_guest_) { |
+ if (browser_plugin_guest_ && |
+ !base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSitePerProcess)) { |
scoped_ptr<WebContentsView> platform_view(CreateWebContentsView( |
this, delegate, &render_view_host_delegate_view_)); |
@@ -1513,6 +1557,14 @@ void WebContentsImpl::CreateNewWindow( |
// SiteInstance in its own BrowsingInstance. |
bool is_guest = BrowserPluginGuest::IsGuest(this); |
+ if (is_guest && |
+ base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSitePerProcess)) { |
+ // TODO(lazyboy): CreateNewWindow doesn't work for OOPIF-based <webview> |
+ // yet. |
+ NOTREACHED(); |
+ } |
+ |
// If the opener is to be suppressed, the new window can be in any process. |
// Since routing ids are process specific, we must not have one passed in |
// as argument here. |
@@ -4140,7 +4192,11 @@ bool WebContentsImpl::CreateRenderViewForRenderManager( |
// until RenderWidgetHost is attached to RenderFrameHost. We need to special |
// case this because RWH is still a base class of RenderViewHost, and child |
// frame RWHVs are unique in that they do not have their own WebContents. |
- if (!for_main_frame_navigation) { |
+ bool is_guest_in_site_per_process = |
+ !!browser_plugin_guest_.get() && |
+ base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSitePerProcess); |
+ if (!for_main_frame_navigation || is_guest_in_site_per_process) { |
RenderWidgetHostViewChildFrame* rwh_view_child = |
new RenderWidgetHostViewChildFrame(render_view_host); |
rwh_view = rwh_view_child; |
@@ -4284,6 +4340,16 @@ bool WebContentsImpl::IsHidden() { |
return capturer_count_ == 0 && !should_normally_be_visible_; |
} |
+int WebContentsImpl::GetOuterWebContentsFrameTreeNodeID() { |
+ if (node_.parent_web_contents()) { |
+ return node_.parent_web_contents() |
+ ->GetFrameTree() |
+ ->root() |
+ ->frame_tree_node_id(); |
+ } |
+ return -1; |
+} |
+ |
RenderFrameHostManager* WebContentsImpl::GetRenderManager() const { |
return frame_tree_.root()->render_manager(); |
} |
@@ -4294,6 +4360,7 @@ BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() const { |
void WebContentsImpl::SetBrowserPluginGuest(BrowserPluginGuest* guest) { |
CHECK(!browser_plugin_guest_); |
+ CHECK(guest); |
browser_plugin_guest_.reset(guest); |
} |