Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(542)

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: plumb through surface ID *and* widget surface ID for window.open Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index f5d90c62c10cfa3267f72f938a5122b6eb5c275a..244fde007d7b06b9811d8a3e5b71557cea7049f8 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -568,14 +568,30 @@ RenderFrameImpl* RenderFrameImpl::FromRoutingID(int routing_id) {
}
// static
-RenderFrameImpl* RenderFrameImpl::CreateMainFrame(RenderViewImpl* render_view,
- int32 routing_id) {
+RenderFrameImpl* RenderFrameImpl::CreateMainFrame(
+ RenderViewImpl* render_view,
+ int32 routing_id,
+ int32 widget_routing_id,
+ int32 surface_id,
+ bool hidden,
+ const blink::WebScreenInfo& screen_info,
+ CompositorDependencies* compositor_deps) {
+ // A main frame RenderFrame must have a RenderWidget.
+ DCHECK_NE(MSG_ROUTING_NONE, widget_routing_id);
+
RenderFrameImpl* render_frame =
RenderFrameImpl::Create(render_view, routing_id);
WebLocalFrame* web_frame =
WebLocalFrame::create(blink::WebTreeScopeType::Document, render_frame);
render_frame->SetWebFrame(web_frame);
render_view->webview()->setMainFrame(web_frame);
+ render_frame->render_widget_ =
+ RenderWidget::CreateForFrame(widget_routing_id, surface_id, hidden,
+ screen_info, compositor_deps, web_frame);
+ // TODO(kenrb): Observing shouldn't be necessary when we sort out
+ // WasShown and WasHidden, separating page-level visibility from
+ // frame-level visibility.
+ render_frame->render_widget_->RegisterRenderFrame(render_frame);
return render_frame;
}

Powered by Google App Engine
This is Rietveld 408576698