Give the main frame a RenderWidget.
Currently, RenderView is a subclass of RenderWidget, and the RenderWidget
portion is effectively treated as the the widget for the main frame as
well. For a number of reasons, this is a problematic model:
- A remote frame doesn't need a widget; however, a RenderView with a remote
main frame still has a vestigal RenderWidget.
- Code that needs to affect both RenderWidget / RenderView is awkwardly
split between them, in both content and blink.
- RenderView itself is often seen as an easy entry point to perform
page-level work in the renderer. With OOPI, this is no longer a valid
assumption.
In order to incrementally de-widgetize RenderView, the main frame will
have also have a RenderWidget, to make it consistent with the local frame
roots for subframes, which already have a RenderWidget. However, instead of
giving main frames their own RenderWidget, the main frame re-uses the
RenderView as its RenderWidget.
The rationale for taking this approach is to minimize the breakage: today,
Chrome simply doesn't expect to have two "widgets" for a frame.
Instantiating a distinct RenderWidget for the main frame can confuse code
that iterates or counts the active widgets: an example of this is the
security check for injecting WebUI bindings.
In the future, when RenderViewHost has-a RenderWidgetHost (and similarly,
when RenderViewImpl has-a RenderWidget) instead of today's is-a relation,
then it be conceptually much more straightforward to transition completely
to the new model.
BUG=419087
Review URL: https://codereview.chromium.org/1303773002
Cr-Commit-Position: refs/heads/master@{#356176}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 6b1407b7..5dce2b39 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1343,14 +1343,33 @@
// it should be hidden.
should_normally_be_visible_ = !params.initially_hidden;
- // Either both routing ids can be given, or neither can be.
+ // The routing ids must either all be set or all be unset.
DCHECK((params.routing_id == MSG_ROUTING_NONE &&
- params.main_frame_routing_id == MSG_ROUTING_NONE) ||
+ params.main_frame_routing_id == MSG_ROUTING_NONE &&
+ params.main_frame_widget_routing_id == MSG_ROUTING_NONE) ||
(params.routing_id != MSG_ROUTING_NONE &&
- params.main_frame_routing_id != MSG_ROUTING_NONE));
- GetRenderManager()->Init(params.browser_context, params.site_instance,
- params.routing_id, params.main_frame_routing_id,
- MSG_ROUTING_NONE);
+ params.main_frame_routing_id != MSG_ROUTING_NONE &&
+ params.main_frame_widget_routing_id != MSG_ROUTING_NONE));
+
+ scoped_refptr<SiteInstance> site_instance = params.site_instance;
+ if (!site_instance)
+ site_instance = SiteInstance::Create(params.browser_context);
+
+ // A main RenderFrameHost always has a RenderWidgetHost, since it is always a
+ // local root by definition.
+ // TODO(avi): Once RenderViewHostImpl has-a RenderWidgetHostImpl, it will no
+ // longer be necessary to eagerly grab a routing ID for the view.
+ // https://crbug.com/545684
+ int32_t view_routing_id = params.routing_id;
+ int32_t main_frame_widget_routing_id = params.main_frame_widget_routing_id;
+ if (main_frame_widget_routing_id == MSG_ROUTING_NONE) {
+ view_routing_id = main_frame_widget_routing_id =
+ site_instance->GetProcess()->GetNextRoutingID();
+ }
+
+ GetRenderManager()->Init(site_instance.get(), view_routing_id,
+ params.main_frame_routing_id,
+ main_frame_widget_routing_id);
frame_tree_.root()->SetFrameName(params.main_frame_name);
WebContentsViewDelegate* delegate =
@@ -1661,8 +1680,9 @@
void WebContentsImpl::CreateNewWindow(
SiteInstance* source_site_instance,
- int route_id,
- int main_frame_route_id,
+ int32_t route_id,
+ int32_t main_frame_route_id,
+ int32_t main_frame_widget_route_id,
const ViewHostMsg_CreateWindow_Params& params,
SessionStorageNamespace* session_storage_namespace) {
// We usually create the new window in the same BrowsingInstance (group of
@@ -1721,14 +1741,10 @@
CHECK(session_storage_namespace_impl->IsFromContext(dom_storage_context));
if (delegate_ &&
- !delegate_->ShouldCreateWebContents(this,
- route_id,
- main_frame_route_id,
- params.window_container_type,
- params.frame_name,
- params.target_url,
- partition_id,
- session_storage_namespace)) {
+ !delegate_->ShouldCreateWebContents(
+ this, route_id, main_frame_route_id, main_frame_widget_route_id,
+ params.window_container_type, params.frame_name, params.target_url,
+ partition_id, session_storage_namespace)) {
if (route_id != MSG_ROUTING_NONE &&
!RenderViewHost::FromID(render_process_id, route_id)) {
// If the embedder didn't create a WebContents for this route, we need to
@@ -1738,6 +1754,8 @@
GetRenderViewHost()->GetProcess()->ResumeRequestsForView(route_id);
GetRenderViewHost()->GetProcess()->ResumeRequestsForView(
main_frame_route_id);
+ GetRenderViewHost()->GetProcess()->ResumeRequestsForView(
+ main_frame_widget_route_id);
return;
}
@@ -1746,6 +1764,7 @@
CreateParams create_params(GetBrowserContext(), site_instance.get());
create_params.routing_id = route_id;
create_params.main_frame_routing_id = main_frame_route_id;
+ create_params.main_frame_widget_routing_id = main_frame_widget_route_id;
create_params.main_frame_name = params.frame_name;
create_params.opener_render_process_id = render_process_id;
create_params.opener_render_frame_id = params.opener_render_frame_id;
