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 <set> | 7 #include <set> |
8 | 8 |
9 #include "base/containers/hash_tables.h" | 9 #include "base/containers/hash_tables.h" |
10 #include "base/containers/scoped_ptr_hash_map.h" | 10 #include "base/containers/scoped_ptr_hash_map.h" |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 | 156 |
157 ScrollbarLayerType* scrollbar_layer = layer->ToScrollbarLayer(); | 157 ScrollbarLayerType* scrollbar_layer = layer->ToScrollbarLayer(); |
158 if (!scrollbar_layer) | 158 if (!scrollbar_layer) |
159 return; | 159 return; |
160 | 160 |
161 RawPtrLayerImplMap::const_iterator iter = | 161 RawPtrLayerImplMap::const_iterator iter = |
162 new_layers->find(layer->id()); | 162 new_layers->find(layer->id()); |
163 ScrollbarLayerImplBase* scrollbar_layer_impl = | 163 ScrollbarLayerImplBase* scrollbar_layer_impl = |
164 iter != new_layers->end() | 164 iter != new_layers->end() |
165 ? static_cast<ScrollbarLayerImplBase*>(iter->second) | 165 ? static_cast<ScrollbarLayerImplBase*>(iter->second) |
166 : NULL; | 166 : nullptr; |
167 DCHECK(scrollbar_layer_impl); | 167 DCHECK(scrollbar_layer_impl); |
168 | 168 |
169 scrollbar_layer->PushScrollClipPropertiesTo(scrollbar_layer_impl); | 169 scrollbar_layer->PushScrollClipPropertiesTo(scrollbar_layer_impl); |
170 } | 170 } |
171 | 171 |
172 void UpdateScrollbarLayerPointersRecursive(const RawPtrLayerImplMap* new_layers, | 172 void UpdateScrollbarLayerPointersRecursive(const RawPtrLayerImplMap* new_layers, |
173 Layer* layer) { | 173 Layer* layer) { |
174 UpdateScrollbarLayerPointersRecursiveInternal<Layer, ScrollbarLayerInterface>( | 174 UpdateScrollbarLayerPointersRecursiveInternal<Layer, ScrollbarLayerInterface>( |
175 new_layers, layer); | 175 new_layers, layer); |
176 } | 176 } |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
302 #endif | 302 #endif |
303 } | 303 } |
304 | 304 |
305 void TreeSynchronizer::PushProperties(LayerImpl* layer, LayerImpl* layer_impl) { | 305 void TreeSynchronizer::PushProperties(LayerImpl* layer, LayerImpl* layer_impl) { |
306 size_t num_dependents_need_push_properties = 0; | 306 size_t num_dependents_need_push_properties = 0; |
307 PushPropertiesInternal( | 307 PushPropertiesInternal( |
308 layer, layer_impl, &num_dependents_need_push_properties); | 308 layer, layer_impl, &num_dependents_need_push_properties); |
309 } | 309 } |
310 | 310 |
311 } // namespace cc | 311 } // namespace cc |
OLD | NEW |