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 6626ab0c93e3221f62e0920b824deca043d82f7c..e77b53ab80ba6b4b9dc4464571f848db3a55b774 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -1208,20 +1208,20 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { |
WebContentsViewDelegate* delegate = |
GetContentClient()->browser()->GetWebContentsViewDelegate(this); |
- if (browser_plugin_guest_) { |
- scoped_ptr<WebContentsView> platform_view(CreateWebContentsView( |
- this, delegate, &render_view_host_delegate_view_)); |
- |
- WebContentsViewGuest* rv = new WebContentsViewGuest( |
- this, browser_plugin_guest_.get(), platform_view.Pass(), |
- render_view_host_delegate_view_); |
- render_view_host_delegate_view_ = rv; |
- view_.reset(rv); |
- } else { |
+// if (browser_plugin_guest_) { |
+// scoped_ptr<WebContentsView> platform_view(CreateWebContentsView( |
+// this, delegate, &render_view_host_delegate_view_)); |
+// |
+// WebContentsViewGuest* rv = new WebContentsViewGuest( |
+// this, browser_plugin_guest_.get(), platform_view.Pass(), |
+// render_view_host_delegate_view_); |
+// render_view_host_delegate_view_ = rv; |
+// view_.reset(rv); |
+// } else { |
// Regular WebContentsView. |
view_.reset(CreateWebContentsView( |
this, delegate, &render_view_host_delegate_view_)); |
- } |
+// } |
CHECK(render_view_host_delegate_view_); |
CHECK(view_.get()); |
@@ -1274,6 +1274,37 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { |
nullptr, GetRenderManager()->current_frame_host(), true); |
} |
+int WebContentsImpl::AttachLocalFrameToGuest(WebContents* embedder_web_contents, |
+ int embedder_frame_routing_id) { |
+ // 1. Create a link to our parent WebContents. |
+ node_.set_parent_web_contents( |
+ static_cast<WebContentsImpl*>(embedder_web_contents)); |
+ |
+ // 2. Create a swapped out RVH and a proxy in our render manager, pointing |
+ // to embedder site instance. The swapped out RVH will be used to send |
+ // postMessage to guest. |
+ int swapped_out_render_view_routing_id = MSG_ROUTING_NONE; |
+ int proxy_to_embedder_routing_id = GetRenderManager()->CreateEmbedderProxy( |
+ embedder_web_contents->GetSiteInstance(), |
Charlie Reis
2015/04/08 23:42:11
What if the embedder WebContents has the <webview>
lazyboy
2015/04/14 01:38:03
Done.
|
+ &swapped_out_render_view_routing_id); |
+ |
+ // 3. Swap the embedder's initial frame pointing to guest with 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. |
+ RenderFrameHostImpl* embedder_frame = |
+ RenderFrameHostImpl::FromID( |
+ embedder_web_contents->GetRenderProcessHost()->GetID(), |
Charlie Reis
2015/04/08 23:42:11
Same. We have to pass in the process ID, because
lazyboy
2015/04/14 01:38:04
Done.
|
+ embedder_frame_routing_id); |
+ DCHECK(embedder_frame); |
+ embedder_frame->frame_tree_node()->render_manager() |
+ ->ReplaceWithGuestProxy(proxy_to_embedder_routing_id); |
+ |
+ // The swapped out render view routing ID will be used to send |
+ // postMessage. |
+ return swapped_out_render_view_routing_id; |
+} |
+ |
void WebContentsImpl::OnWebContentsDestroyed(WebContentsImpl* web_contents) { |
RemoveDestructionObserver(web_contents); |
@@ -1531,6 +1562,8 @@ void WebContentsImpl::CreateNewWindow( |
int main_frame_route_id, |
const ViewHostMsg_CreateWindow_Params& params, |
SessionStorageNamespace* session_storage_namespace) { |
+ // TODO(lazyboy): CreateNewWindow doesn't work for <webview> yet. |
+ DCHECK(0); |
// We usually create the new window in the same BrowsingInstance (group of |
// script-related windows), by passing in the current SiteInstance. However, |
// if the opener is being suppressed (in a non-guest), we create a new |
@@ -1751,12 +1784,12 @@ void WebContentsImpl::ShowCreatedWidget(int route_id, |
return; |
RenderWidgetHostView* view = NULL; |
- BrowserPluginGuest* guest = GetBrowserPluginGuest(); |
- if (guest && guest->embedder_web_contents()) { |
- view = guest->embedder_web_contents()->GetRenderWidgetHostView(); |
- } else { |
+// BrowserPluginGuest* guest = GetBrowserPluginGuest(); |
+// if (guest && guest->embedder_web_contents()) { |
+// view = guest->embedder_web_contents()->GetRenderWidgetHostView(); |
+// } else { |
view = GetRenderWidgetHostView(); |
- } |
+// } |
if (is_fullscreen) { |
DCHECK_EQ(MSG_ROUTING_NONE, fullscreen_widget_routing_id_); |
@@ -4331,7 +4364,8 @@ 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 = !!browser_plugin_guest_.get(); |
+ if (!for_main_frame_navigation || is_guest) { |
RenderWidgetHostViewChildFrame* rwh_view_child = |
new RenderWidgetHostViewChildFrame(render_view_host); |
rwh_view = rwh_view_child; |
@@ -4473,6 +4507,14 @@ bool WebContentsImpl::IsHidden() { |
return capturer_count_ == 0 && !should_normally_be_visible_; |
} |
+int64 WebContentsImpl::GetParentFrameTreeNodeID() { |
+ 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(); |
} |
@@ -4487,6 +4529,7 @@ BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() const { |
void WebContentsImpl::SetBrowserPluginGuest(BrowserPluginGuest* guest) { |
CHECK(!browser_plugin_guest_); |
+ CHECK(guest); |
browser_plugin_guest_.reset(guest); |
} |