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

Unified Diff: content/renderer/render_widget.cc

Issue 12472015: Add implementation of WebWidgetClient::initializeLayerTreeView() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: null check compositor_, initialization can fail Created 7 years, 9 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
« no previous file with comments | « content/renderer/render_widget.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « content/renderer/render_widget.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698