reland -- Disable animations during aura tests.

ui/gfx/compositor/layer_animation_sequence.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/gfx/compositor/layer_animation_sequence.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/debug/trace_event.h"
 #include "ui/gfx/compositor/layer_animation_delegate.h"
 #include "ui/gfx/compositor/layer_animation_element.h"
 #include "ui/gfx/compositor/layer_animation_observer.h"
 
 namespace ui {
 
 LayerAnimationSequence::LayerAnimationSequence()
     : is_cyclic_(false),
+      is_animating_(false),
       last_element_(0) {
 }
 
 LayerAnimationSequence::LayerAnimationSequence(LayerAnimationElement* element)
     : is_cyclic_(false),
+      is_animating_(false),
       last_element_(0) {
   AddElement(element);
 }
 
 LayerAnimationSequence::~LayerAnimationSequence() {
   FOR_EACH_OBSERVER(LayerAnimationObserver,
                     observers_,
                     DetachedFromSequence(this));
 }
 
 void LayerAnimationSequence::Progress(base::TimeDelta elapsed,
                                       LayerAnimationDelegate* delegate) {
   if (elements_.empty())
     return;
 
+  // We are now animating.
+  is_animating_ = true;
+
   if (is_cyclic_ && duration_ > base::TimeDelta()) {
     // If delta = elapsed - last_start_ is huge, we can skip ahead by complete
     // loops to save time.
     base::TimeDelta delta = elapsed - last_start_;
     int64 k = delta.ToInternalValue() / duration_.ToInternalValue() - 1;
     if (k > 0) {
       last_start_ += base::TimeDelta::FromInternalValue(
           k * duration_.ToInternalValue());
     }
   }
@@ skipping 13 matching lines @@
     if (elements_[current_index]->duration() > base::TimeDelta()) {
       t = (elapsed - last_start_).InMillisecondsF() /
           elements_[current_index]->duration().InMillisecondsF();
     }
     elements_[current_index]->Progress(t, delegate);
   }
 
   if (!is_cyclic_ && elapsed == duration_) {
     last_element_ = 0;
     last_start_ = base::TimeDelta::FromMilliseconds(0);
+    is_animating_ = false;
     NotifyEnded();
   }
 }
 
 void LayerAnimationSequence::GetTargetValue(
     LayerAnimationElement::TargetValue* target) const {
   if (is_cyclic_)
     return;
 
   for (size_t i = last_element_; i < elements_.size(); ++i)
     elements_[i]->GetTargetValue(target);
 }
 
 void LayerAnimationSequence::Abort() {
   size_t current_index = last_element_ % elements_.size();
   while (current_index < elements_.size()) {
     elements_[current_index]->Abort();
     ++current_index;
   }
   last_element_ = 0;
   last_start_ = base::TimeDelta::FromMilliseconds(0);
+  is_animating_ = false;
   NotifyAborted();
 }
 
 void LayerAnimationSequence::AddElement(LayerAnimationElement* element) {
   // Update duration and properties.
   duration_ += element->duration();
   properties_.insert(element->properties().begin(),
                      element->properties().end());
   elements_.push_back(make_linked_ptr(element));
 }
@@ skipping 47 matching lines @@
                     OnLayerAnimationEnded(this));
 }
 
 void LayerAnimationSequence::NotifyAborted() {
   FOR_EACH_OBSERVER(LayerAnimationObserver,
                     observers_,
                     OnLayerAnimationAborted(this));
 }
 
 }  // namespace ui