Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 0ac71eeed443e1e4c3b300b6601a2f76d394da0d..ce12ea3d00cd9995eb784c9935b6a7a1c54ab013 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -116,6 +116,7 @@ |
#include "third_party/WebKit/public/platform/WebVector.h" |
#include "third_party/WebKit/public/web/WebColorSuggestion.h" |
#include "third_party/WebKit/public/web/WebDocument.h" |
+#include "third_party/WebKit/public/web/WebFrameWidget.h" |
#include "third_party/WebKit/public/web/WebGlyphCache.h" |
#include "third_party/WebKit/public/web/WebLocalFrame.h" |
#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" |
@@ -501,9 +502,12 @@ RenderFrameImpl* RenderFrameImpl::FromRoutingID(int32 routing_id) { |
} |
// static |
-void RenderFrameImpl::CreateFrame(int routing_id, |
- int parent_routing_id, |
- int proxy_routing_id) { |
+void RenderFrameImpl::CreateFrame( |
+ int routing_id, |
+ int parent_routing_id, |
+ int proxy_routing_id, |
+ CompositorDependencies* compositor_deps, |
+ const FrameMsg_NewFrame_WidgetParams& params) { |
nasko
2015/01/14 20:08:05
nit: s/params/widget_params/
nasko
2015/01/15 23:11:15
Did you mean to change this?
kenrb
2015/01/16 17:44:00
Done.
|
// 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. |
@@ -533,6 +537,19 @@ void RenderFrameImpl::CreateFrame(int routing_id, |
web_frame->initializeToReplaceRemoteFrame(proxy->web_frame()); |
} |
render_frame->SetWebFrame(web_frame); |
+ |
+ if (params.routing_id != MSG_ROUTING_NONE) { |
+ CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kSitePerProcess)); |
+ render_frame->render_widget_ = RenderWidget::CreateForFrame( |
+ params.routing_id, params.surface_id, params.hidden, |
+ render_frame->render_view_->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); |
+ } |
+ |
render_frame->Initialize(); |
} |
@@ -3490,6 +3507,13 @@ void RenderFrameImpl::WasHidden() { |
} |
void RenderFrameImpl::WasShown() { |
+ // TODO(kenrb): Need to figure out how to do this better. Should |
+ // VisibilityState remain a page-level concept or move to frames? |
nasko
2015/01/14 20:08:05
I think visibility is page-level concept. There mi
kenrb
2015/01/16 17:44:00
We seem to use visibility as a way to prevent anyt
|
+ // The semantics of 'Show' might have to change here. |
+ if (render_widget_) { |
+ render_view()->webview()->setVisibilityState( |
+ blink::WebPageVisibilityStateVisible, false); |
+ } |
FOR_EACH_OBSERVER(RenderFrameObserver, observers_, WasShown()); |
} |