| Index: ui/gfx/compositor/layer_animation_element.cc
|
| ===================================================================
|
| --- ui/gfx/compositor/layer_animation_element.cc (revision 107719)
|
| +++ ui/gfx/compositor/layer_animation_element.cc (working copy)
|
| @@ -7,6 +7,8 @@
|
| #include "base/compiler_specific.h"
|
| #include "ui/base/animation/tween.h"
|
| #include "ui/gfx/compositor/layer_animation_delegate.h"
|
| +#include "ui/gfx/rect.h"
|
| +#include "ui/gfx/transform.h"
|
|
|
| namespace ui {
|
|
|
| @@ -24,7 +26,6 @@
|
| virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE {}
|
| virtual void OnProgress(double t,
|
| LayerAnimationDelegate* delegate) OVERRIDE {}
|
| - virtual void OnGetTarget(TargetValue* target) const OVERRIDE {}
|
| virtual void OnAbort() OVERRIDE {}
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Pause);
|
| @@ -50,10 +51,6 @@
|
| Tween::ValueBetween(t, start_, target_));
|
| }
|
|
|
| - virtual void OnGetTarget(TargetValue* target) const OVERRIDE {
|
| - target->transform = target_;
|
| - }
|
| -
|
| virtual void OnAbort() OVERRIDE {}
|
|
|
| private:
|
| @@ -89,10 +86,6 @@
|
| delegate->SetBoundsFromAnimation(Tween::ValueBetween(t, start_, target_));
|
| }
|
|
|
| - virtual void OnGetTarget(TargetValue* target) const OVERRIDE {
|
| - target->bounds = target_;
|
| - }
|
| -
|
| virtual void OnAbort() OVERRIDE {}
|
|
|
| private:
|
| @@ -126,10 +119,6 @@
|
| delegate->SetOpacityFromAnimation(Tween::ValueBetween(t, start_, target_));
|
| }
|
|
|
| - virtual void OnGetTarget(TargetValue* target) const OVERRIDE {
|
| - target->opacity = target_;
|
| - }
|
| -
|
| virtual void OnAbort() OVERRIDE {}
|
|
|
| private:
|
| @@ -148,11 +137,6 @@
|
|
|
| } // namespace
|
|
|
| -// LayerAnimationElement::TargetValue ------------------------------------------
|
| -
|
| -LayerAnimationElement::TargetValue::TargetValue() : opacity(0.0f) {
|
| -}
|
| -
|
| // LayerAnimationElement -------------------------------------------------------
|
|
|
| LayerAnimationElement::LayerAnimationElement(
|
| @@ -171,14 +155,9 @@
|
| if (first_frame_)
|
| OnStart(delegate);
|
| OnProgress(t, delegate);
|
| - delegate->ScheduleDrawForAnimation();
|
| first_frame_ = t == 1.0;
|
| }
|
|
|
| -void LayerAnimationElement::GetTargetValue(TargetValue* target) const {
|
| - OnGetTarget(target);
|
| -}
|
| -
|
| void LayerAnimationElement::Abort() {
|
| first_frame_ = true;
|
| OnAbort();
|
|
|