Revert 107715 - Enable the new layer animation framework.

ui/gfx/compositor/layer.cc

 // Copyright (c) 2011 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/gfx/compositor/layer.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContentLayer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebExternalTextureLayer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFloatPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFloatRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
 #include "ui/base/animation/animation.h"
 #if defined(USE_WEBKIT_COMPOSITOR)
 #include "ui/gfx/compositor/compositor_cc.h"
 #endif
 #include "ui/gfx/canvas_skia.h"
-#include "ui/gfx/compositor/layer_animator.h"
+#include "ui/gfx/compositor/layer_animation_manager.h"
 #include "ui/gfx/interpolated_transform.h"
 #include "ui/gfx/point3.h"
 
 namespace {
 
 const float EPSILON = 1e-3f;
 
 bool IsApproximateMultilpleOf(float value, float base) {
   float remainder = fmod(fabs(value), base);
   return remainder < EPSILON || base - remainder < EPSILON;
@@ skipping 96 matching lines @@
 }
 
 bool Layer::Contains(const Layer* other) const {
   for (const Layer* parent = other; parent; parent = parent->parent()) {
     if (parent == this)
       return true;
   }
   return false;
 }
 
-void Layer::SetAnimator(LayerAnimator* animator) {
-  if (animator)
-    animator->SetDelegate(this);
-  animator_.reset(animator);
-}
-
-LayerAnimator* Layer::GetAnimator() {
-  if (!animator_.get())
-    SetAnimator(LayerAnimator::CreateDefaultAnimator());
-  return animator_.get();
+void Layer::SetAnimation(Animation* animation) {
+  if (animation) {
+    if (!animator_.get())
+      animator_.reset(new LayerAnimationManager(this));
+    animation->Start();
+    animator_->SetAnimation(animation);
+  } else {
+    animator_.reset();
+  }
 }
 
 void Layer::SetTransform(const ui::Transform& transform) {
-  GetAnimator()->SetTransform(transform);
-}
-
-Transform Layer::GetTargetTransform() const {
-  if (animator_.get() && animator_->is_animating())
-    return animator_->GetTargetTransform();
-  return transform_;
+  StopAnimatingIfNecessary(LayerAnimationManager::TRANSFORM);
+  if (animator_.get() && animator_->IsRunning()) {
+    animator_->AnimateTransform(transform);
+    return;
+  }
+  SetTransformImmediately(transform);
 }
 
 void Layer::SetBounds(const gfx::Rect& bounds) {
-  GetAnimator()->SetBounds(bounds);
+  StopAnimatingIfNecessary(LayerAnimationManager::LOCATION);
+  if (animator_.get() && animator_->IsRunning() &&
+      bounds.size() == bounds_.size()) {
+    animator_->AnimateToPoint(bounds.origin());
+    return;
+  }
+  SetBoundsImmediately(bounds);
 }
 
 gfx::Rect Layer::GetTargetBounds() const {
-  if (animator_.get() && animator_->is_animating())
-    return animator_->GetTargetBounds();
+  if (animator_.get() && animator_->IsRunning())
+    return gfx::Rect(animator_->GetTargetPoint(), bounds_.size());
   return bounds_;
 }
 
 void Layer::SetOpacity(float opacity) {
-  GetAnimator()->SetOpacity(opacity);
-}
-
-float Layer::GetTargetOpacity() const {
-  if (animator_.get() && animator_->is_animating())
-    return animator_->GetTargetOpacity();
-  return opacity_;
+  StopAnimatingIfNecessary(LayerAnimationManager::OPACITY);
+  if (animator_.get() && animator_->IsRunning()) {
+    animator_->AnimateOpacity(opacity);
+    return;
+  }
+  SetOpacityImmediately(opacity);
 }
 
 void Layer::SetVisible(bool visible) {
   if (visible_ == visible)
     return;
 
   bool was_drawn = IsDrawn();
   visible_ = visible;
 #if defined(USE_WEBKIT_COMPOSITOR)
   // TODO(piman): Expose a visibility flag on WebLayer.
@@ skipping 398 matching lines @@
   const Layer* p = this;
   for (; p && p != ancestor; p = p->parent()) {
     if (p->transform().HasChange())
       transform->ConcatTransform(p->transform());
     transform->ConcatTranslate(static_cast<float>(p->bounds().x()),
                                static_cast<float>(p->bounds().y()));
   }
   return p == ancestor;
 }
 
+void Layer::StopAnimatingIfNecessary(
+    LayerAnimationManager::AnimationProperty property) {
+  if (!animator_.get() || !animator_->IsRunning() ||
+      !animator_->got_initial_tick()) {
+    return;
+  }
+
+  if (property != LayerAnimationManager::LOCATION &&
+      animator_->IsAnimating(LayerAnimationManager::LOCATION)) {
+    SetBoundsImmediately(
+        gfx::Rect(animator_->GetTargetPoint(), bounds_.size()));
+  }
+  if (property != LayerAnimationManager::OPACITY &&
+      animator_->IsAnimating(LayerAnimationManager::OPACITY)) {
+    SetOpacityImmediately(animator_->GetTargetOpacity());
+  }
+  if (property != LayerAnimationManager::TRANSFORM &&
+      animator_->IsAnimating(LayerAnimationManager::TRANSFORM)) {
+    SetTransformImmediately(animator_->GetTargetTransform());
+  }
+  animator_.reset();
+}
+
 void Layer::SetBoundsImmediately(const gfx::Rect& bounds) {
   bounds_ = bounds;
 
   SetNeedsToRecomputeHole();
 #if defined(USE_WEBKIT_COMPOSITOR)
   web_layer_.setBounds(bounds.size());
   RecomputeTransform();
   RecomputeDrawsContent();
 #endif
 }
 
 void Layer::SetTransformImmediately(const ui::Transform& transform) {
   transform_ = transform;
 
   SetNeedsToRecomputeHole();
 #if defined(USE_WEBKIT_COMPOSITOR)
   RecomputeTransform();
 #endif
 }
 
 void Layer::SetOpacityImmediately(float opacity) {
   opacity_ = opacity;
   SetNeedsToRecomputeHole();
 #if defined(USE_WEBKIT_COMPOSITOR)
   if (visible_)
     web_layer_.setOpacity(opacity);
 #endif
 }
 
-void Layer::SetBoundsFromAnimation(const gfx::Rect& bounds) {
+void Layer::SetBoundsFromAnimator(const gfx::Rect& bounds) {
   SetBoundsImmediately(bounds);
 }
 
-void Layer::SetTransformFromAnimation(const Transform& transform) {
+void Layer::SetTransformFromAnimator(const Transform& transform) {
   SetTransformImmediately(transform);
 }
 
-void Layer::SetOpacityFromAnimation(float opacity) {
+void Layer::SetOpacityFromAnimator(float opacity) {
   SetOpacityImmediately(opacity);
 }
 
-void Layer::ScheduleDrawForAnimation() {
-  ScheduleDraw();
-}
-
-const gfx::Rect& Layer::GetBoundsForAnimation() const {
-  return bounds();
-}
-
-const Transform& Layer::GetTransformForAnimation() const {
-  return transform();
-}
-
-float Layer::GetOpacityForAnimation() const {
-  return opacity();
-}
-
-void Layer::OnLayerAnimationEnded(LayerAnimationSequence* sequence) {
-  if (delegate_)
-    delegate_->OnLayerAnimationEnded(sequence);
-}
-
 #if defined(USE_WEBKIT_COMPOSITOR)
 void Layer::CreateWebLayer() {
   web_layer_ = WebKit::WebContentLayer::create(this, this);
   web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
   web_layer_.setOpaque(true);
   web_layer_is_accelerated_ = false;
   RecomputeDrawsContent();
 }
 
 void Layer::RecomputeTransform() {
@@ skipping 16 matching lines @@
 #else
     unsigned int texture_id = 0;
 #endif
     web_layer_.to<WebKit::WebExternalTextureLayer>().setTextureId(
         should_draw ? texture_id : 0);
   }
 }
 #endif
 
 }  // namespace ui