Reland r107720 - 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 "ui/base/animation/animation.h"
-#include "ui/gfx/compositor/layer_animation_manager.h"
+#include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/canvas_skia.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);
@@ skipping 76 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::SetAnimation(Animation* animation) {
-  if (animation) {
-    if (!animator_.get())
-      animator_.reset(new LayerAnimationManager(this));
-    animation->Start();
-    animator_->SetAnimation(animation);
-  } else {
-    animator_.reset();
-  }
+void Layer::SetAnimator(LayerAnimator* animator) {
+  animator->SetDelegate(this);

[sky, 2011/10/20 20:30:30]

Seems like you should allow NULL here to reset to default.

+  animator_.reset(animator);
+}
+
+LayerAnimator* Layer::GetAnimator() {
+  if (!animator_.get())
+    SetAnimator(LayerAnimator::CreateDefaultAnimator());
+  return animator_.get();
 }
 
 void Layer::SetTransform(const ui::Transform& transform) {
-  StopAnimatingIfNecessary(LayerAnimationManager::TRANSFORM);
-  if (animator_.get() && animator_->IsRunning()) {
-    animator_->AnimateTransform(transform);
-    return;
-  }
-  SetTransformImmediately(transform);
+  if (animator_.get())
+    animator_->SetTransform(transform);
+  else
+    SetTransformImmediately(transform);
+}
+
+Transform Layer::GetTargetTransform() const {
+  if (animator_.get() && animator_->is_animating())
+    return animator_->GetTargetTransform();
+  return transform_;
 }
 
 void Layer::SetBounds(const gfx::Rect& bounds) {
-  StopAnimatingIfNecessary(LayerAnimationManager::LOCATION);
-  if (animator_.get() && animator_->IsRunning() &&
-      bounds.size() == bounds_.size()) {
-    animator_->AnimateToPoint(bounds.origin());
-    return;
-  }
-  SetBoundsImmediately(bounds);
+  if (animator_.get())
+    animator_->SetBounds(bounds);
+  else
+    SetBoundsImmediately(bounds);
 }
 
 gfx::Rect Layer::GetTargetBounds() const {
-  if (animator_.get() && animator_->IsRunning())
-    return gfx::Rect(animator_->GetTargetPoint(), bounds_.size());
+  if (animator_.get() && animator_->is_animating())
+    return animator_->GetTargetBounds();
   return bounds_;
 }
 
 void Layer::SetOpacity(float opacity) {
-  StopAnimatingIfNecessary(LayerAnimationManager::OPACITY);
-  if (animator_.get() && animator_->IsRunning()) {
-    animator_->AnimateOpacity(opacity);
-    return;
-  }
-  SetOpacityImmediately(opacity);
+  if (animator_.get())
+    animator_->SetOpacity(opacity);
+  else
+    SetOpacityImmediately(opacity);
+}
+
+float Layer::GetTargetOpacity() const {
+  if (animator_.get() && animator_->is_animating())
+    return animator_->GetTargetOpacity();
+  return opacity_;
 }
 
 void Layer::SetVisible(bool visible) {
   if (visible_ == visible)
     return;
 
   bool was_drawn = IsDrawn();
   visible_ = visible;
   bool is_drawn = IsDrawn();
   if (was_drawn == is_drawn)
@@ skipping 269 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;
 
   if (parent())
     parent()->RecomputeHole();
 }
 
 void Layer::SetTransformImmediately(const ui::Transform& transform) {
   transform_ = transform;
 
@@ skipping 16 matching lines @@
     while (!to_process.empty()) {
       Layer* current = to_process.front();
       to_process.pop();
       current->RecomputeHole();
       for (size_t i = 0; i < current->children_.size(); ++i)
         to_process.push(current->children_.at(i));
     }
   }
 }
 
-void Layer::SetBoundsFromAnimator(const gfx::Rect& bounds) {
+void Layer::SetBoundsFromAnimation(const gfx::Rect& bounds) {
   SetBoundsImmediately(bounds);
 }
 
-void Layer::SetTransformFromAnimator(const Transform& transform) {
+void Layer::SetTransformFromAnimation(const Transform& transform) {
   SetTransformImmediately(transform);
 }
 
-void Layer::SetOpacityFromAnimator(float opacity) {
+void Layer::SetOpacityFromAnimation(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();
+}
+
 }  // namespace ui