| Index: ui/gfx/compositor/layer_animation_element.h
|
| ===================================================================
|
| --- ui/gfx/compositor/layer_animation_element.h (revision 107719)
|
| +++ ui/gfx/compositor/layer_animation_element.h (working copy)
|
| @@ -10,9 +10,11 @@
|
|
|
| #include "base/time.h"
|
| #include "ui/gfx/compositor/compositor_export.h"
|
| -#include "ui/gfx/rect.h"
|
| -#include "ui/gfx/transform.h"
|
|
|
| +namespace gfx {
|
| +class Rect;
|
| +} // gfx
|
| +
|
| namespace ui {
|
|
|
| class LayerAnimationDelegate;
|
| @@ -29,14 +31,6 @@
|
| OPACITY
|
| };
|
|
|
| - struct TargetValue {
|
| - public:
|
| - TargetValue();
|
| - gfx::Rect bounds;
|
| - Transform transform;
|
| - float opacity;
|
| - };
|
| -
|
| typedef std::set<AnimatableProperty> AnimatableProperties;
|
|
|
| LayerAnimationElement(const AnimatableProperties& properties,
|
| @@ -77,9 +71,6 @@
|
| // 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_; }
|
|
|
| @@ -91,7 +82,6 @@
|
| // 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:
|
|
|