OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/trees/tree_synchronizer.h" | 5 #include "cc/trees/tree_synchronizer.h" |
6 | 6 |
7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "cc/animation/scrollbar_animation_controller.h" | 9 #include "cc/animation/scrollbar_animation_controller.h" |
10 #include "cc/layer.h" | 10 #include "cc/layers/layer.h" |
11 #include "cc/layer_impl.h" | 11 #include "cc/layers/layer_impl.h" |
12 #include "cc/scrollbar_layer.h" | 12 #include "cc/layers/scrollbar_layer.h" |
13 #include "cc/scrollbar_layer_impl.h" | 13 #include "cc/layers/scrollbar_layer_impl.h" |
14 | 14 |
15 namespace cc { | 15 namespace cc { |
16 | 16 |
17 typedef ScopedPtrHashMap<int, LayerImpl> ScopedPtrLayerImplMap; | 17 typedef ScopedPtrHashMap<int, LayerImpl> ScopedPtrLayerImplMap; |
18 typedef base::hash_map<int, LayerImpl*> RawPtrLayerImplMap; | 18 typedef base::hash_map<int, LayerImpl*> RawPtrLayerImplMap; |
19 | 19 |
20 void CollectExistingLayerImplRecursive(ScopedPtrLayerImplMap* old_layers, | 20 void CollectExistingLayerImplRecursive(ScopedPtrLayerImplMap* old_layers, |
21 scoped_ptr<LayerImpl> layer_impl) { | 21 scoped_ptr<LayerImpl> layer_impl) { |
22 if (!layer_impl) | 22 if (!layer_impl) |
23 return; | 23 return; |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 | 208 |
209 void TreeSynchronizer::PushProperties(Layer* layer, LayerImpl* layer_impl) { | 209 void TreeSynchronizer::PushProperties(Layer* layer, LayerImpl* layer_impl) { |
210 PushPropertiesInternal(layer, layer_impl); | 210 PushPropertiesInternal(layer, layer_impl); |
211 } | 211 } |
212 | 212 |
213 void TreeSynchronizer::PushProperties(LayerImpl* layer, LayerImpl* layer_impl) { | 213 void TreeSynchronizer::PushProperties(LayerImpl* layer, LayerImpl* layer_impl) { |
214 PushPropertiesInternal(layer, layer_impl); | 214 PushPropertiesInternal(layer, layer_impl); |
215 } | 215 } |
216 | 216 |
217 } // namespace cc | 217 } // namespace cc |
OLD | NEW |