| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 3ff49b1889d976d705b22f75d808ab38f8739272..94c658225c7ba1c636b6676527908f4916406405 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -933,7 +933,8 @@ RenderFrameImpl* RenderFrameImpl::CreateMainFrame(
|
| render_frame->BindToWebFrame(web_frame);
|
| render_view->webview()->setMainFrame(web_frame);
|
| render_frame->render_widget_ = RenderWidget::CreateForFrame(
|
| - widget_routing_id, hidden, screen_info, compositor_deps, web_frame);
|
| + widget_routing_id, hidden, screen_info, compositor_deps, web_frame,
|
| + render_view->frame_sink_id());
|
| // TODO(avi): This DCHECK is to track cleanup for https://crbug.com/545684
|
| DCHECK_EQ(render_view->GetWidget(), render_frame->render_widget_)
|
| << "Main frame is no longer reusing the RenderView as its widget! "
|
| @@ -1007,7 +1008,8 @@ void RenderFrameImpl::CreateFrame(
|
| SiteIsolationPolicy::AreCrossProcessFramesPossible());
|
| render_frame->render_widget_ = RenderWidget::CreateForFrame(
|
| widget_params.routing_id, widget_params.hidden,
|
| - render_frame->render_view_->screen_info(), compositor_deps, web_frame);
|
| + render_frame->render_view_->screen_info(), compositor_deps, web_frame,
|
| + render_frame->render_view_->frame_sink_id());
|
| // TODO(avi): The main frame re-uses the RenderViewImpl as its widget, so
|
| // avoid double-registering the frame as an observer.
|
| // https://crbug.com/545684
|
| @@ -1331,8 +1333,9 @@ RenderWidgetFullscreenPepper* RenderFrameImpl::CreatePepperFullscreenContainer(
|
| if (render_view_->webview())
|
| active_url = render_view()->GetURLForGraphicsContext3D();
|
| RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create(
|
| - render_view()->routing_id(), GetRenderWidget()->compositor_deps(),
|
| - plugin, active_url, GetRenderWidget()->screen_info());
|
| + render_view()->routing_id(), GetRenderWidget()->compositor_deps(), plugin,
|
| + active_url, GetRenderWidget()->screen_info(),
|
| + GetRenderWidget()->frame_sink_id());
|
| widget->show(blink::WebNavigationPolicyIgnore);
|
| return widget;
|
| }
|
|
|