Chromium Code Reviews| Index: ui/gfx/compositor/layer_animation_element.h |
| diff --git a/ui/gfx/compositor/layer_animation_element.h b/ui/gfx/compositor/layer_animation_element.h |
| index 12697b0531ea6d67330daba8d9c1fa64b394fdb0..3c556325bc66a7f0c96eaba3bec0c096c8d8c21c 100644 |
| --- a/ui/gfx/compositor/layer_animation_element.h |
| +++ b/ui/gfx/compositor/layer_animation_element.h |
| @@ -10,10 +10,8 @@ |
| #include "base/time.h" |
| #include "ui/gfx/compositor/compositor_export.h" |
| - |
| -namespace gfx { |
| -class Rect; |
| -} // gfx |
| +#include "ui/gfx/rect.h" |
| +#include "ui/gfx/transform.h" |
| namespace ui { |
| @@ -31,6 +29,12 @@ class COMPOSITOR_EXPORT LayerAnimationElement { |
| OPACITY |
| }; |
| + struct TargetValue { |
| + gfx::Rect bounds; |
| + Transform transform; |
| + float opacity; |
|
sky
2011/10/20 23:31:35
initialize opacity to 0.
|
| + }; |
| + |
| typedef std::set<AnimatableProperty> AnimatableProperties; |
| LayerAnimationElement(const AnimatableProperties& properties, |
| @@ -71,6 +75,9 @@ class COMPOSITOR_EXPORT LayerAnimationElement { |
| // before OnStarted or Progress. |
| void Abort(); |
| + // Assigns the target value to |target|. |
| + void GetTargetValue(TargetValue* target) const; |
| + |
| // The properties that the element modifies. |
| const AnimatableProperties& properties() const { return properties_; } |
| @@ -82,6 +89,7 @@ class COMPOSITOR_EXPORT LayerAnimationElement { |
| // OnProgress. |
| virtual void OnStart(LayerAnimationDelegate* delegate) = 0; |
| virtual void OnProgress(double t, LayerAnimationDelegate* delegate) = 0; |
| + virtual void OnGetTarget(TargetValue* target) const = 0; |
| virtual void OnAbort() = 0; |
| private: |