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

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 1062403002: cc: Plumbing for storing property trees (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix perf test compile failure Created 5 years, 8 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 | « cc/trees/layer_tree_host_common_perftest.cc ('k') | cc/trees/property_tree.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index b831bb38b504a22eb30c3c16606a2dcf0d0f7d04..63cbedbb0fbb748fc5763562b3617c308988b47b 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -543,6 +543,10 @@ bool LayerTreeImpl::UpdateDrawProperties(bool update_lcd_text) {
DRAW_MODE_RESOURCELESS_SOFTWARE);
++render_surface_layer_list_id_;
+
+ // TODO(enne): Synchronize property trees to compositor thread and use
+ // them here.
+ PropertyTrees* property_trees = nullptr;
LayerTreeHostCommon::CalcDrawPropsImplInputs inputs(
root_layer(), DrawViewportSize(),
layer_tree_host_impl_->DrawTransform(), device_scale_factor(),
@@ -552,8 +556,8 @@ bool LayerTreeImpl::UpdateDrawProperties(bool update_lcd_text) {
settings().can_use_lcd_text, settings().layers_always_allowed_lcd_text,
can_render_to_separate_surface,
settings().layer_transforms_should_scale_layer_contents,
- settings().verify_property_trees,
- &render_surface_layer_list_, render_surface_layer_list_id_);
+ settings().verify_property_trees, &render_surface_layer_list_,
+ render_surface_layer_list_id_, property_trees);
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
}
« no previous file with comments | « cc/trees/layer_tree_host_common_perftest.cc ('k') | cc/trees/property_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698