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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 616133002: Make RenderFrame(Host) own a RenderWidget(Host). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed output surface problems, combined RenderFrame and RenderWidget creation Created 6 years, 2 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 9dba04f52787e62aa1ad85cf1a70fc36c56ff13c..15559ad2d5d8019c4dd0189d6ab716a1937ca48a 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -386,7 +386,10 @@ RenderFrameImpl* RenderFrameImpl::FromRoutingID(int32 routing_id) {
}
// static
-void RenderFrameImpl::CreateFrame(int routing_id, int parent_routing_id) {
+void RenderFrameImpl::CreateFrame(
+ int routing_id,
+ int parent_routing_id,
+ const FrameMsg_NewFrame_WidgetParams& params) {
// TODO(nasko): For now, this message is only sent for subframes, as the
// top level frame is created when the RenderView is created through the
// ViewMsg_New IPC.
@@ -406,6 +409,14 @@ void RenderFrameImpl::CreateFrame(int routing_id, int parent_routing_id) {
parent_web_frame->createLocalChild("", render_frame);
render_frame->SetWebFrame(web_frame);
render_frame->Initialize();
+
+ if (params.routing_id != MSG_ROUTING_NONE) {
+ render_frame->render_widget_ = RenderWidget::CreateForFrame(
+ params.routing_id,
+ params.surface_id,
+ params.hidden,
+ render_frame->render_view_->screen_info());
+ }
}
// static

Powered by Google App Engine
This is Rietveld 408576698