Add implementation of WebWidgetClient::initializeLayerTreeView()
This adds an implementation of WebWidgetClient::initializeLayerTreeView() that
takes no parameters. The WLTV::Settings parameter is already ignored and we have
(and have to have) API surface to set the root layer so that parameter isn't
all that helpful.
This has to land and roll before https://bugs.webkit.org/show_bug.cgi?id=111632.
After that lands and rolls back into chromium, the 3-param implementation of
content::RenderWidget::initializeLayerTreeView() can be removed.
[email protected]
Review URL: https://chromiumcodereview.appspot.com/12472015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186840 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 1efc33c..7ab8dc1 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1362,18 +1362,23 @@
webwidget_->enterForceCompositingMode(false);
}
+void RenderWidget::initializeLayerTreeView() {
+ compositor_ = RenderWidgetCompositor::Create(this);
+ if (!compositor_)
+ return;
+
+ 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) {
- compositor_ = RenderWidgetCompositor::Create(this, settings);
- if (!compositor_)
- return;
-
- compositor_->setRootLayer(root_layer);
- compositor_->setViewportSize(size_, physical_backing_size_);
- if (init_complete_)
- compositor_->setSurfaceReady();
+ initializeLayerTreeView();
+ if (compositor_)
+ compositor_->setRootLayer(root_layer);
}
WebKit::WebLayerTreeView* RenderWidget::layerTreeView() {
