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

Unified Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 2183403002: cc: Move data to LayerTree from LayerTreeHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@layer_tree_change
Patch Set: .. Created 4 years, 5 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
Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index 6e676358bda2c06bf526634b9546a4e433908733..4a1fcc1e0ff196dd84ceb7ef2b5d7c2422547cc0 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -778,7 +778,7 @@ void RenderWidgetCompositor::registerViewportLayers(
const blink::WebLayer* pageScaleLayer,
const blink::WebLayer* innerViewportScrollLayer,
const blink::WebLayer* outerViewportScrollLayer) {
- layer_tree_host_->RegisterViewportLayers(
+ layer_tree_host_->GetLayerTree()->RegisterViewportLayers(
// TODO(bokan): This check can probably be removed now, but it looks
// like overscroll elasticity may still be NULL until VisualViewport
// registers its layers.
@@ -786,7 +786,8 @@ void RenderWidgetCompositor::registerViewportLayers(
// viewports.
overscrollElasticityLayer
? static_cast<const cc_blink::WebLayerImpl*>(
- overscrollElasticityLayer)->layer()
+ overscrollElasticityLayer)
+ ->layer()
: NULL,
static_cast<const cc_blink::WebLayerImpl*>(pageScaleLayer)->layer(),
static_cast<const cc_blink::WebLayerImpl*>(innerViewportScrollLayer)
@@ -803,7 +804,7 @@ void RenderWidgetCompositor::registerViewportLayers(
}
void RenderWidgetCompositor::clearViewportLayers() {
- layer_tree_host_->RegisterViewportLayers(
+ layer_tree_host_->GetLayerTree()->RegisterViewportLayers(
scoped_refptr<cc::Layer>(), scoped_refptr<cc::Layer>(),
scoped_refptr<cc::Layer>(), scoped_refptr<cc::Layer>());
}

Powered by Google App Engine
This is Rietveld 408576698