| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 #ifndef CC_TREES_LAYER_TREE_IMPL_H_ | 5 #ifndef CC_TREES_LAYER_TREE_IMPL_H_ |
| 6 #define CC_TREES_LAYER_TREE_IMPL_H_ | 6 #define CC_TREES_LAYER_TREE_IMPL_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 void AsValueInto(base::trace_event::TracedValue* dict) const; | 124 void AsValueInto(base::trace_event::TracedValue* dict) const; |
| 125 | 125 |
| 126 // Other public methods | 126 // Other public methods |
| 127 // --------------------------------------------------------------------------- | 127 // --------------------------------------------------------------------------- |
| 128 LayerImpl* root_layer() const { return root_layer_.get(); } | 128 LayerImpl* root_layer() const { return root_layer_.get(); } |
| 129 void SetRootLayer(scoped_ptr<LayerImpl>); | 129 void SetRootLayer(scoped_ptr<LayerImpl>); |
| 130 scoped_ptr<LayerImpl> DetachLayerTree(); | 130 scoped_ptr<LayerImpl> DetachLayerTree(); |
| 131 | 131 |
| 132 void SetPropertyTrees(const PropertyTrees& property_trees) { | 132 void SetPropertyTrees(const PropertyTrees& property_trees) { |
| 133 property_trees_ = property_trees; | 133 property_trees_ = property_trees; |
| 134 property_trees_.transform_tree.set_source_to_parent_updates_allowed(false); |
| 134 } | 135 } |
| 135 PropertyTrees* property_trees() { return &property_trees_; } | 136 PropertyTrees* property_trees() { return &property_trees_; } |
| 136 | 137 |
| 137 void PushPropertiesTo(LayerTreeImpl* tree_impl); | 138 void PushPropertiesTo(LayerTreeImpl* tree_impl); |
| 138 | 139 |
| 139 int source_frame_number() const { return source_frame_number_; } | 140 int source_frame_number() const { return source_frame_number_; } |
| 140 void set_source_frame_number(int frame_number) { | 141 void set_source_frame_number(int frame_number) { |
| 141 source_frame_number_ = frame_number; | 142 source_frame_number_ = frame_number; |
| 142 } | 143 } |
| 143 | 144 |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 | 429 |
| 429 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; | 430 scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_; |
| 430 | 431 |
| 431 private: | 432 private: |
| 432 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); | 433 DISALLOW_COPY_AND_ASSIGN(LayerTreeImpl); |
| 433 }; | 434 }; |
| 434 | 435 |
| 435 } // namespace cc | 436 } // namespace cc |
| 436 | 437 |
| 437 #endif // CC_TREES_LAYER_TREE_IMPL_H_ | 438 #endif // CC_TREES_LAYER_TREE_IMPL_H_ |
| OLD | NEW |