| 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 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 545 void SetParent(Layer* layer); | 545 void SetParent(Layer* layer); |
| 546 bool DescendantIsFixedToContainerLayer() const; | 546 bool DescendantIsFixedToContainerLayer() const; |
| 547 | 547 |
| 548 // Returns the index of the child or -1 if not found. | 548 // Returns the index of the child or -1 if not found. |
| 549 int IndexOfChild(const Layer* reference); | 549 int IndexOfChild(const Layer* reference); |
| 550 | 550 |
| 551 // This should only be called from RemoveFromParent(). | 551 // This should only be called from RemoveFromParent(). |
| 552 void RemoveChildOrDependent(Layer* child); | 552 void RemoveChildOrDependent(Layer* child); |
| 553 | 553 |
| 554 // LayerAnimationValueProvider implementation. | 554 // LayerAnimationValueProvider implementation. |
| 555 virtual gfx::ScrollOffset ScrollOffsetForAnimation() const OVERRIDE; | 555 virtual gfx::ScrollOffset ScrollOffsetForAnimation() const override; |
| 556 | 556 |
| 557 // LayerAnimationValueObserver implementation. | 557 // LayerAnimationValueObserver implementation. |
| 558 virtual void OnFilterAnimated(const FilterOperations& filters) OVERRIDE; | 558 virtual void OnFilterAnimated(const FilterOperations& filters) override; |
| 559 virtual void OnOpacityAnimated(float opacity) OVERRIDE; | 559 virtual void OnOpacityAnimated(float opacity) override; |
| 560 virtual void OnTransformAnimated(const gfx::Transform& transform) OVERRIDE; | 560 virtual void OnTransformAnimated(const gfx::Transform& transform) override; |
| 561 virtual void OnScrollOffsetAnimated( | 561 virtual void OnScrollOffsetAnimated( |
| 562 const gfx::ScrollOffset& scroll_offset) OVERRIDE; | 562 const gfx::ScrollOffset& scroll_offset) override; |
| 563 virtual void OnAnimationWaitingForDeletion() OVERRIDE; | 563 virtual void OnAnimationWaitingForDeletion() override; |
| 564 virtual bool IsActive() const OVERRIDE; | 564 virtual bool IsActive() const override; |
| 565 | 565 |
| 566 // If this layer has a scroll parent, it removes |this| from its list of | 566 // If this layer has a scroll parent, it removes |this| from its list of |
| 567 // scroll children. | 567 // scroll children. |
| 568 void RemoveFromScrollTree(); | 568 void RemoveFromScrollTree(); |
| 569 | 569 |
| 570 // If this layer has a clip parent, it removes |this| from its list of clip | 570 // If this layer has a clip parent, it removes |this| from its list of clip |
| 571 // children. | 571 // children. |
| 572 void RemoveFromClipTree(); | 572 void RemoveFromClipTree(); |
| 573 | 573 |
| 574 LayerList children_; | 574 LayerList children_; |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 641 DrawProperties<Layer> draw_properties_; | 641 DrawProperties<Layer> draw_properties_; |
| 642 | 642 |
| 643 PaintProperties paint_properties_; | 643 PaintProperties paint_properties_; |
| 644 | 644 |
| 645 DISALLOW_COPY_AND_ASSIGN(Layer); | 645 DISALLOW_COPY_AND_ASSIGN(Layer); |
| 646 }; | 646 }; |
| 647 | 647 |
| 648 } // namespace cc | 648 } // namespace cc |
| 649 | 649 |
| 650 #endif // CC_LAYERS_LAYER_H_ | 650 #endif // CC_LAYERS_LAYER_H_ |
| OLD | NEW |