| OLD | NEW |
| 1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 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_H_ | 5 #ifndef CC_LAYERS_LAYER_H_ |
| 6 #define CC_LAYERS_LAYER_H_ | 6 #define CC_LAYERS_LAYER_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 515 // Returns the index of the child or -1 if not found. | 515 // Returns the index of the child or -1 if not found. |
| 516 int IndexOfChild(const Layer* reference); | 516 int IndexOfChild(const Layer* reference); |
| 517 | 517 |
| 518 // This should only be called from RemoveFromParent(). | 518 // This should only be called from RemoveFromParent(). |
| 519 void RemoveChildOrDependent(Layer* child); | 519 void RemoveChildOrDependent(Layer* child); |
| 520 | 520 |
| 521 // LayerAnimationValueObserver implementation. | 521 // LayerAnimationValueObserver implementation. |
| 522 virtual void OnFilterAnimated(const FilterOperations& filters) OVERRIDE; | 522 virtual void OnFilterAnimated(const FilterOperations& filters) OVERRIDE; |
| 523 virtual void OnOpacityAnimated(float opacity) OVERRIDE; | 523 virtual void OnOpacityAnimated(float opacity) OVERRIDE; |
| 524 virtual void OnTransformAnimated(const gfx::Transform& transform) OVERRIDE; | 524 virtual void OnTransformAnimated(const gfx::Transform& transform) OVERRIDE; |
| 525 virtual void OnAnimationWaitingForDeletion() OVERRIDE; |
| 525 virtual bool IsActive() const OVERRIDE; | 526 virtual bool IsActive() const OVERRIDE; |
| 526 | 527 |
| 527 LayerList children_; | 528 LayerList children_; |
| 528 Layer* parent_; | 529 Layer* parent_; |
| 529 | 530 |
| 530 // Layer instances have a weak pointer to their LayerTreeHost. | 531 // Layer instances have a weak pointer to their LayerTreeHost. |
| 531 // This pointer value is nil when a Layer is not in a tree and is | 532 // This pointer value is nil when a Layer is not in a tree and is |
| 532 // updated via SetLayerTreeHost() if a layer moves between trees. | 533 // updated via SetLayerTreeHost() if a layer moves between trees. |
| 533 LayerTreeHost* layer_tree_host_; | 534 LayerTreeHost* layer_tree_host_; |
| 534 | 535 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 589 DrawProperties<Layer> draw_properties_; | 590 DrawProperties<Layer> draw_properties_; |
| 590 | 591 |
| 591 PaintProperties paint_properties_; | 592 PaintProperties paint_properties_; |
| 592 | 593 |
| 593 DISALLOW_COPY_AND_ASSIGN(Layer); | 594 DISALLOW_COPY_AND_ASSIGN(Layer); |
| 594 }; | 595 }; |
| 595 | 596 |
| 596 } // namespace cc | 597 } // namespace cc |
| 597 | 598 |
| 598 #endif // CC_LAYERS_LAYER_H_ | 599 #endif // CC_LAYERS_LAYER_H_ |
| OLD | NEW |