| 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 #ifndef CC_LAYERS_LAYER_IMPL_H_ | 5 #ifndef CC_LAYERS_LAYER_IMPL_H_ |
| 6 #define CC_LAYERS_LAYER_IMPL_H_ | 6 #define CC_LAYERS_LAYER_IMPL_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 591 // Properties internal to LayerImpl | 591 // Properties internal to LayerImpl |
| 592 LayerImpl* parent_; | 592 LayerImpl* parent_; |
| 593 OwnedLayerImplList children_; | 593 OwnedLayerImplList children_; |
| 594 | 594 |
| 595 LayerImpl* scroll_parent_; | 595 LayerImpl* scroll_parent_; |
| 596 | 596 |
| 597 // Storing a pointer to a set rather than a set since this will be rarely | 597 // Storing a pointer to a set rather than a set since this will be rarely |
| 598 // used. If this pointer turns out to be too heavy, we could have this (and | 598 // used. If this pointer turns out to be too heavy, we could have this (and |
| 599 // the scroll parent above) be stored in a LayerImpl -> scroll_info | 599 // the scroll parent above) be stored in a LayerImpl -> scroll_info |
| 600 // map somewhere. | 600 // map somewhere. |
| 601 scoped_ptr<std::set<LayerImpl*> > scroll_children_; | 601 scoped_ptr<std::set<LayerImpl*>> scroll_children_; |
| 602 | 602 |
| 603 LayerImpl* clip_parent_; | 603 LayerImpl* clip_parent_; |
| 604 scoped_ptr<std::set<LayerImpl*> > clip_children_; | 604 scoped_ptr<std::set<LayerImpl*>> clip_children_; |
| 605 | 605 |
| 606 // mask_layer_ can be temporarily stolen during tree sync, we need this ID to | 606 // mask_layer_ can be temporarily stolen during tree sync, we need this ID to |
| 607 // confirm newly assigned layer is still the previous one | 607 // confirm newly assigned layer is still the previous one |
| 608 int mask_layer_id_; | 608 int mask_layer_id_; |
| 609 scoped_ptr<LayerImpl> mask_layer_; | 609 scoped_ptr<LayerImpl> mask_layer_; |
| 610 int replica_layer_id_; // ditto | 610 int replica_layer_id_; // ditto |
| 611 scoped_ptr<LayerImpl> replica_layer_; | 611 scoped_ptr<LayerImpl> replica_layer_; |
| 612 int layer_id_; | 612 int layer_id_; |
| 613 LayerTreeImpl* layer_tree_impl_; | 613 LayerTreeImpl* layer_tree_impl_; |
| 614 | 614 |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 714 DrawProperties<LayerImpl> draw_properties_; | 714 DrawProperties<LayerImpl> draw_properties_; |
| 715 | 715 |
| 716 scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info_; | 716 scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info_; |
| 717 | 717 |
| 718 DISALLOW_COPY_AND_ASSIGN(LayerImpl); | 718 DISALLOW_COPY_AND_ASSIGN(LayerImpl); |
| 719 }; | 719 }; |
| 720 | 720 |
| 721 } // namespace cc | 721 } // namespace cc |
| 722 | 722 |
| 723 #endif // CC_LAYERS_LAYER_IMPL_H_ | 723 #endif // CC_LAYERS_LAYER_IMPL_H_ |
| OLD | NEW |