cc: Make LayerAnimationController keep state for clearing scroll delta

cc/animation/layer_animation_controller.cc

 // Copyright 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 "cc/animation/layer_animation_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_delegate.h"
 #include "cc/animation/animation_registrar.h"
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/animation/layer_animation_value_observer.h"
 #include "cc/animation/layer_animation_value_provider.h"
 #include "cc/animation/scroll_offset_animation_curve.h"
 #include "cc/base/scoped_ptr_algorithm.h"
 #include "cc/output/filter_operations.h"
 #include "ui/gfx/geometry/box_f.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 
 LayerAnimationController::LayerAnimationController(int id)
     : registrar_(0),
       id_(id),
       is_active_(false),
       value_provider_(nullptr),
       layer_animation_delegate_(nullptr),
-      needs_to_start_animations_(false) {
+      needs_to_start_animations_(false),
+      scroll_offset_animation_was_interrupted_(false) {
 }
 
 LayerAnimationController::~LayerAnimationController() {
   if (registrar_)
     registrar_->UnregisterAnimationController(this);
 }
 
 scoped_refptr<LayerAnimationController> LayerAnimationController::Create(
     int id) {
   return make_scoped_refptr(new LayerAnimationController(id));
@@ skipping 17 matching lines @@
 
  private:
   int id_;
 };
 
 void LayerAnimationController::RemoveAnimation(int animation_id) {
   auto animations_to_remove =
       animations_.remove_if(HasAnimationId(animation_id));
   for (auto it = animations_to_remove; it != animations_.end(); ++it) {
     if ((*it)->target_property() == Animation::ScrollOffset) {
-      NotifyObserversScrollOffsetAnimationRemoved();
+      scroll_offset_animation_was_interrupted_ = true;
       break;
     }
   }
   animations_.erase(animations_to_remove, animations_.end());
   UpdateActivation(NormalActivation);
 }
 
 struct HasAnimationIdAndProperty {
   HasAnimationIdAndProperty(int id, Animation::TargetProperty target_property)
       : id_(id), target_property_(target_property) {}
   bool operator()(Animation* animation) const {
     return animation->id() == id_ &&
         animation->target_property() == target_property_;
   }
 
  private:
   int id_;
   Animation::TargetProperty target_property_;
 };
 
 void LayerAnimationController::RemoveAnimation(
     int animation_id,
     Animation::TargetProperty target_property) {
   auto animations_to_remove = animations_.remove_if(
       HasAnimationIdAndProperty(animation_id, target_property));
   if (target_property == Animation::ScrollOffset &&
       animations_to_remove != animations_.end())
-    NotifyObserversScrollOffsetAnimationRemoved();
+    scroll_offset_animation_was_interrupted_ = true;
 
   animations_.erase(animations_to_remove, animations_.end());
   UpdateActivation(NormalActivation);
 }
 
 void LayerAnimationController::AbortAnimations(
     Animation::TargetProperty target_property) {
   for (size_t i = 0; i < animations_.size(); ++i) {
     if (animations_[i]->target_property() == target_property &&
         !animations_[i]->is_finished())
@@ skipping 142 matching lines @@
 void LayerAnimationController::ActivateAnimations() {
   for (size_t i = 0; i < animations_.size(); ++i) {
     animations_[i]->set_affects_active_observers(
         animations_[i]->affects_pending_observers());
   }
   animations_.erase(cc::remove_if(&animations_,
                                   animations_.begin(),
                                   animations_.end(),
                                   AffectsNoObservers()),
                     animations_.end());
+  scroll_offset_animation_was_interrupted_ = false;
   UpdateActivation(NormalActivation);
 }
 
 void LayerAnimationController::AddAnimation(scoped_ptr<Animation> animation) {
   animations_.push_back(animation.Pass());
   needs_to_start_animations_ = true;
   UpdateActivation(NormalActivation);
 }
 
 Animation* LayerAnimationController::GetAnimation(
@@ skipping 352 matching lines @@
       animations[i]->set_affects_pending_observers(false);
   }
   animations.erase(cc::remove_if(&animations,
                                  animations.begin(),
                                  animations.end(),
                                  AffectsActiveOnlyAndIsWaitingForDeletion),
                    animations.end());
 }
 
 void LayerAnimationController::PushPropertiesToImplThread(
-    LayerAnimationController* controller_impl) const {
+    LayerAnimationController* controller_impl) {
   for (size_t i = 0; i < animations_.size(); ++i) {
     Animation* current_impl =
         controller_impl->GetAnimationById(animations_[i]->id());
     if (current_impl)
       animations_[i]->PushPropertiesTo(current_impl);
   }
+  controller_impl->scroll_offset_animation_was_interrupted_ =
+      scroll_offset_animation_was_interrupted_;
+  scroll_offset_animation_was_interrupted_ = false;
 }
 
 void LayerAnimationController::StartAnimations(base::TimeTicks monotonic_time) {
   DCHECK(needs_to_start_animations_);
   needs_to_start_animations_ = false;
   // First collect running properties affecting each type of observer.
   TargetProperties blocked_properties_for_active_observers;
   TargetProperties blocked_properties_for_pending_observers;
   std::vector<size_t> animations_waiting_for_target;
 
@@ skipping 379 matching lines @@
     }
   }
 }
 
 void LayerAnimationController::NotifyObserversAnimationWaitingForDeletion() {
   FOR_EACH_OBSERVER(LayerAnimationValueObserver,
                     value_observers_,
                     OnAnimationWaitingForDeletion());
 }
 
-void LayerAnimationController::NotifyObserversScrollOffsetAnimationRemoved() {
-  FOR_EACH_OBSERVER(LayerAnimationValueObserver, value_observers_,
-                    OnScrollOffsetAnimationRemoved());
-}
-
 bool LayerAnimationController::HasValueObserver() {
   if (value_observers_.might_have_observers()) {
     ObserverListBase<LayerAnimationValueObserver>::Iterator it(
         value_observers_);
     return it.GetNext() != nullptr;
   }
   return false;
 }
 
 bool LayerAnimationController::HasActiveValueObserver() {
   if (value_observers_.might_have_observers()) {
     ObserverListBase<LayerAnimationValueObserver>::Iterator it(
         value_observers_);
     LayerAnimationValueObserver* obs;
     while ((obs = it.GetNext()) != nullptr)
       if (obs->IsActive())
         return true;
   }
   return false;
 }
 
 }  // namespace cc