| 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 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 543 // This should only be called from RemoveFromParent(). | 543 // This should only be called from RemoveFromParent(). |
| 544 void RemoveChildOrDependent(Layer* child); | 544 void RemoveChildOrDependent(Layer* child); |
| 545 | 545 |
| 546 // LayerAnimationValueProvider implementation. | 546 // LayerAnimationValueProvider implementation. |
| 547 virtual gfx::Vector2dF ScrollOffsetForAnimation() const OVERRIDE; | 547 virtual gfx::Vector2dF ScrollOffsetForAnimation() const OVERRIDE; |
| 548 | 548 |
| 549 // LayerAnimationValueObserver implementation. | 549 // LayerAnimationValueObserver implementation. |
| 550 virtual void OnFilterAnimated(const FilterOperations& filters) OVERRIDE; | 550 virtual void OnFilterAnimated(const FilterOperations& filters) OVERRIDE; |
| 551 virtual void OnOpacityAnimated(float opacity) OVERRIDE; | 551 virtual void OnOpacityAnimated(float opacity) OVERRIDE; |
| 552 virtual void OnTransformAnimated(const gfx::Transform& transform) OVERRIDE; | 552 virtual void OnTransformAnimated(const gfx::Transform& transform) OVERRIDE; |
| 553 virtual void OnScrollOffsetAnimated(gfx::Vector2dF scroll_offset) OVERRIDE; | 553 virtual void OnScrollOffsetAnimated( |
| 554 const gfx::Vector2dF& scroll_offset) OVERRIDE; |
| 554 virtual void OnAnimationWaitingForDeletion() OVERRIDE; | 555 virtual void OnAnimationWaitingForDeletion() OVERRIDE; |
| 555 virtual bool IsActive() const OVERRIDE; | 556 virtual bool IsActive() const OVERRIDE; |
| 556 | 557 |
| 557 LayerList children_; | 558 LayerList children_; |
| 558 Layer* parent_; | 559 Layer* parent_; |
| 559 | 560 |
| 560 // Layer instances have a weak pointer to their LayerTreeHost. | 561 // Layer instances have a weak pointer to their LayerTreeHost. |
| 561 // This pointer value is nil when a Layer is not in a tree and is | 562 // This pointer value is nil when a Layer is not in a tree and is |
| 562 // updated via SetLayerTreeHost() if a layer moves between trees. | 563 // updated via SetLayerTreeHost() if a layer moves between trees. |
| 563 LayerTreeHost* layer_tree_host_; | 564 LayerTreeHost* layer_tree_host_; |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 620 DrawProperties<Layer> draw_properties_; | 621 DrawProperties<Layer> draw_properties_; |
| 621 | 622 |
| 622 PaintProperties paint_properties_; | 623 PaintProperties paint_properties_; |
| 623 | 624 |
| 624 DISALLOW_COPY_AND_ASSIGN(Layer); | 625 DISALLOW_COPY_AND_ASSIGN(Layer); |
| 625 }; | 626 }; |
| 626 | 627 |
| 627 } // namespace cc | 628 } // namespace cc |
| 628 | 629 |
| 629 #endif // CC_LAYERS_LAYER_H_ | 630 #endif // CC_LAYERS_LAYER_H_ |
| OLD | NEW |