From 39d357e3248f80abea0159765ff39554affb40db Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 4 Jan 2017 14:17:57 +0100 Subject: BASELINE: Update Chromium to 55.0.2883.105 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And updates ninja to 1.7.2 Change-Id: I20d43c737f82764d857ada9a55586901b18b9243 Reviewed-by: Michael Brüning --- chromium/cc/trees/tree_synchronizer.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'chromium/cc/trees/tree_synchronizer.cc') diff --git a/chromium/cc/trees/tree_synchronizer.cc b/chromium/cc/trees/tree_synchronizer.cc index 60177bf0648..3f467e04ad6 100644 --- a/chromium/cc/trees/tree_synchronizer.cc +++ b/chromium/cc/trees/tree_synchronizer.cc @@ -13,6 +13,7 @@ #include "cc/layers/layer.h" #include "cc/layers/layer_collections.h" #include "cc/layers/layer_impl.h" +#include "cc/trees/layer_tree.h" #include "cc/trees/layer_tree_host.h" #include "cc/trees/layer_tree_impl.h" @@ -33,7 +34,7 @@ void SynchronizeTreesInternal(LayerTreeType* source_tree, PushLayerList(&old_layer_map, source_tree, tree_impl); - for (int id : property_trees->effect_tree.mask_replica_layer_ids()) { + for (int id : property_trees->effect_tree.mask_layer_ids()) { std::unique_ptr layer_impl(ReuseOrCreateLayerImpl( &old_layer_map, source_tree->LayerById(id), tree_impl)); tree_impl->AddLayer(std::move(layer_impl)); @@ -45,8 +46,8 @@ void TreeSynchronizer::SynchronizeTrees(Layer* layer_root, if (!layer_root) { tree_impl->DetachLayers(); } else { - SynchronizeTreesInternal(layer_root->layer_tree_host(), tree_impl, - layer_root->layer_tree_host()->property_trees()); + SynchronizeTreesInternal(layer_root->GetLayerTree(), tree_impl, + layer_root->GetLayerTree()->property_trees()); } } @@ -104,7 +105,7 @@ void TreeSynchronizer::PushLayerProperties(LayerTreeImpl* pending_tree, active_tree); } -void TreeSynchronizer::PushLayerProperties(LayerTreeHost* host_tree, +void TreeSynchronizer::PushLayerProperties(LayerTree* host_tree, LayerTreeImpl* impl_tree) { PushLayerPropertiesInternal(host_tree->LayersThatShouldPushProperties(), impl_tree); -- cgit v1.2.1