Revert 220479 "Add support for inverse transform animations."

trunk/src/ui/compositor/layer_animation_element.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/compositor/layer_animation_element.h"
 
 #include "base/compiler_specific.h"
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_id_provider.h"
 #include "ui/base/animation/tween.h"
@@ skipping 376 matching lines @@
                                 base::TimeDelta duration)
       : LayerAnimationElement(properties, duration) {
   }
   virtual ~ThreadedLayerAnimationElement() {}
 
   virtual bool IsThreaded() const OVERRIDE {
     return (duration() != base::TimeDelta());
   }
 
  protected:
-  explicit ThreadedLayerAnimationElement(const LayerAnimationElement& element)
-    : LayerAnimationElement(element) {
-  }
-
   virtual bool OnProgress(double t,
                           LayerAnimationDelegate* delegate) OVERRIDE {
     if (t < 1.0)
       return false;
 
     if (Started()) {
       delegate->RemoveThreadedAnimation(animation_id());
     }
 
     OnEnd(delegate);
@@ skipping 149 matching lines @@
   }
 
   gfx::Transform start_;
   gfx::Transform cc_start_;
   const gfx::Transform target_;
   gfx::Transform cc_target_;
 
   DISALLOW_COPY_AND_ASSIGN(ThreadedTransformTransition);
 };
 
-// InverseTransformTransision --------------------------------------------------
-
-class InverseTransformTransition : public ThreadedLayerAnimationElement {
- public:
-  InverseTransformTransition(const gfx::Transform& base_transform,
-                             const LayerAnimationElement* uninverted_transition)
-      : ThreadedLayerAnimationElement(*uninverted_transition),
-        base_transform_(base_transform),
-        uninverted_transition_(CheckAndCast(uninverted_transition)) {
-  }
-  virtual ~InverseTransformTransition() {}
-
- protected:
-  virtual void OnStart(LayerAnimationDelegate* delegate) OVERRIDE {
-    gfx::Transform start(delegate->GetTransformForAnimation());
-    effective_start_ = base_transform_ * start;
-
-    TargetValue target;
-    uninverted_transition_->GetTargetValue(&target);
-    base_target_ = target.transform;
-
-    set_tween_type(uninverted_transition_->tween_type());
-
-    float device_scale_factor = delegate->GetDeviceScaleFactor();
-    const gfx::Transform cc_base_start = Layer::ConvertTransformToCCTransform(
-        base_transform_,
-        device_scale_factor);
-    const gfx::Transform cc_base_target = Layer::ConvertTransformToCCTransform(
-        base_target_,
-        device_scale_factor);
-    TransformAnimationCurveAdapter base_curve(tween_type(),
-                                              cc_base_start,
-                                              cc_base_target,
-                                              duration());
-
-    const gfx::Transform cc_start = Layer::ConvertTransformToCCTransform(
-        start, device_scale_factor);
-    animation_curve_.reset(new InverseTransformCurveAdapter(
-        base_curve, cc_start, duration()));
-    computed_target_transform_ = ComputeWithBaseTransform(effective_start_,
-                                                          base_target_);
-  }
-
-  virtual void OnAbort(LayerAnimationDelegate* delegate) OVERRIDE {
-    if (delegate && Started()) {
-      ThreadedLayerAnimationElement::OnAbort(delegate);
-      delegate->SetTransformFromAnimation(ComputeCurrentTransform());
-    }
-  }
-
-  virtual void OnEnd(LayerAnimationDelegate* delegate) OVERRIDE {
-    delegate->SetTransformFromAnimation(computed_target_transform_);
-  }
-
-  virtual scoped_ptr<cc::Animation> CreateCCAnimation() OVERRIDE {
-    scoped_ptr<cc::Animation> animation(
-        cc::Animation::Create(animation_curve_->Clone(),
-                              animation_id(),
-                              animation_group_id(),
-                              cc::Animation::Transform));
-    return animation.Pass();
-  }
-
-  virtual void OnGetTarget(TargetValue* target) const OVERRIDE {
-    target->transform = computed_target_transform_;
-  }
-
- private:
-  gfx::Transform ComputeCurrentTransform() const {
-    gfx::Transform base_current = Tween::ValueBetween(
-        Tween::CalculateValue(tween_type(), last_progressed_fraction()),
-        base_transform_,
-        base_target_);
-    return ComputeWithBaseTransform(effective_start_, base_current);
-  }
-
-  gfx::Transform ComputeWithBaseTransform(gfx::Transform start,
-                                          gfx::Transform target) const {
-    gfx::Transform to_return(gfx::Transform::kSkipInitialization);
-    DCHECK(target.GetInverse(&to_return));
-
-    to_return.PreconcatTransform(start);
-    return to_return;
-  }
-
-  static AnimatableProperties GetProperties() {
-    AnimatableProperties properties;
-    properties.insert(LayerAnimationElement::TRANSFORM);
-    return properties;
-  }
-
-  static const ThreadedTransformTransition* CheckAndCast(
-      const LayerAnimationElement* element) {
-    const AnimatableProperties& properties = element->properties();
-    DCHECK(properties.find(TRANSFORM) != properties.end());
-    return static_cast<const ThreadedTransformTransition*>(element);
-  }
-
-  gfx::Transform effective_start_;
-  gfx::Transform computed_target_transform_;
-
-  const gfx::Transform base_transform_;
-  gfx::Transform base_target_;
-
-  scoped_ptr<cc::AnimationCurve> animation_curve_;
-
-  const ThreadedTransformTransition* const uninverted_transition_;
-
-  DISALLOW_COPY_AND_ASSIGN(InverseTransformTransition);
-};
-
 }  // namespace
 
 // LayerAnimationElement::TargetValue ------------------------------------------
 
 LayerAnimationElement::TargetValue::TargetValue()
     : opacity(0.0f),
       visibility(false),
       brightness(0.0f),
       grayscale(0.0f),
       color(SK_ColorBLACK) {
@@ skipping 18 matching lines @@
     base::TimeDelta duration)
     : first_frame_(true),
       properties_(properties),
       duration_(GetEffectiveDuration(duration)),
       tween_type_(Tween::LINEAR),
       animation_id_(cc::AnimationIdProvider::NextAnimationId()),
       animation_group_id_(0),
       last_progressed_fraction_(0.0) {
 }
 
-LayerAnimationElement::LayerAnimationElement(
-    const LayerAnimationElement &element)
-    : first_frame_(element.first_frame_),
-      properties_(element.properties_),
-      duration_(element.duration_),
-      tween_type_(element.tween_type_),
-      animation_id_(cc::AnimationIdProvider::NextAnimationId()),
-      animation_group_id_(element.animation_group_id_),
-      last_progressed_fraction_(element.last_progressed_fraction_) {
-}
-
 LayerAnimationElement::~LayerAnimationElement() {
 }
 
 void LayerAnimationElement::Start(LayerAnimationDelegate* delegate,
                                   int animation_group_id) {
   DCHECK(requested_start_time_ != base::TimeTicks());
   DCHECK(first_frame_);
   animation_group_id_ = animation_group_id;
   last_progressed_fraction_ = 0.0;
   OnStart(delegate);
@@ skipping 108 matching lines @@
 }
 
 // static
 LayerAnimationElement* LayerAnimationElement::CreateTransformElement(
     const gfx::Transform& transform,
     base::TimeDelta duration) {
   return new ThreadedTransformTransition(transform, duration);
 }
 
 // static
-LayerAnimationElement* LayerAnimationElement::CreateInverseTransformElement(
-    const gfx::Transform& base_transform,
-    const LayerAnimationElement* uninverted_transition) {
-  return new InverseTransformTransition(base_transform, uninverted_transition);
-}
-
-// static
 LayerAnimationElement*
 LayerAnimationElement::CreateInterpolatedTransformElement(
     InterpolatedTransform* interpolated_transform,
     base::TimeDelta duration) {
   return new InterpolatedTransformTransition(interpolated_transform, duration);
 }
 
 // static
 LayerAnimationElement* LayerAnimationElement::CreateBoundsElement(
     const gfx::Rect& bounds,
@@ skipping 37 matching lines @@
 }
 
 // static
 LayerAnimationElement* LayerAnimationElement::CreateColorElement(
     SkColor color,
     base::TimeDelta duration) {
   return new ColorTransition(color, duration);
 }
 
 }  // namespace ui