| Index: content/renderer/render_widget.cc
|
| diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
|
| index 1efc33cc714538ee0fa242d0da8c93c66a457348..7ab8dc137daa9062b567d3b1738aa240cd0624a5 100644
|
| --- a/content/renderer/render_widget.cc
|
| +++ b/content/renderer/render_widget.cc
|
| @@ -1362,20 +1362,25 @@ void RenderWidget::didDeactivateCompositor() {
|
| webwidget_->enterForceCompositingMode(false);
|
| }
|
|
|
| -void RenderWidget::initializeLayerTreeView(
|
| - WebKit::WebLayerTreeViewClient* client,
|
| - const WebKit::WebLayer& root_layer,
|
| - const WebKit::WebLayerTreeView::Settings& settings) {
|
| - compositor_ = RenderWidgetCompositor::Create(this, settings);
|
| +void RenderWidget::initializeLayerTreeView() {
|
| + compositor_ = RenderWidgetCompositor::Create(this);
|
| if (!compositor_)
|
| return;
|
|
|
| - compositor_->setRootLayer(root_layer);
|
| compositor_->setViewportSize(size_, physical_backing_size_);
|
| if (init_complete_)
|
| compositor_->setSurfaceReady();
|
| }
|
|
|
| +void RenderWidget::initializeLayerTreeView(
|
| + WebKit::WebLayerTreeViewClient* client,
|
| + const WebKit::WebLayer& root_layer,
|
| + const WebKit::WebLayerTreeView::Settings& settings) {
|
| + initializeLayerTreeView();
|
| + if (compositor_)
|
| + compositor_->setRootLayer(root_layer);
|
| +}
|
| +
|
| WebKit::WebLayerTreeView* RenderWidget::layerTreeView() {
|
| return compositor_.get();
|
| }
|
|
|