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

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 1097583002: cc: Commit property trees to the compositor thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Win bool conversion compile fix 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_impl.h ('k') | cc/trees/property_tree_builder.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 cf95f587a0d4acd6caba987b4294fe812591085b..77219764f6117d29e601c58f3e64140bc69493ca 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -192,6 +192,8 @@ void LayerTreeImpl::PushPropertiesTo(LayerTreeImpl* target_tree) {
// The request queue should have been processed and does not require a push.
DCHECK_EQ(ui_resource_request_queue_.size(), 0u);
+ target_tree->SetPropertyTrees(property_trees_);
+
if (next_activation_forces_redraw_) {
target_tree->ForceRedrawNextActivation();
next_activation_forces_redraw_ = false;
@@ -540,9 +542,6 @@ bool LayerTreeImpl::UpdateDrawProperties(bool update_lcd_text) {
++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(),
@@ -553,7 +552,7 @@ bool LayerTreeImpl::UpdateDrawProperties(bool update_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_, property_trees);
+ render_surface_layer_list_id_, &property_trees_);
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
}
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | cc/trees/property_tree_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698