| Index: cc/animation/layer_animation_controller.h
|
| diff --git a/cc/animation/layer_animation_controller.h b/cc/animation/layer_animation_controller.h
|
| index d48951f2dd6da3fd640abcb350372d3b483257d0..6df5c051bb27dd22e982cfae36c6ca3bc9c7195b 100644
|
| --- a/cc/animation/layer_animation_controller.h
|
| +++ b/cc/animation/layer_animation_controller.h
|
| @@ -79,10 +79,6 @@ class CC_EXPORT LayerAnimationController
|
| // the future.
|
| bool IsAnimatingProperty(Animation::TargetProperty target_property) const;
|
|
|
| - // If a sync is forced, then the next time animation updates are pushed to the
|
| - // impl thread, all animations will be transferred.
|
| - void set_force_sync() { force_sync_ = true; }
|
| -
|
| void SetAnimationRegistrar(AnimationRegistrar* registrar);
|
| AnimationRegistrar* animation_registrar() { return registrar_; }
|
|
|
| @@ -120,8 +116,6 @@ class CC_EXPORT LayerAnimationController
|
| LayerAnimationController* controller_impl) const;
|
| void PushPropertiesToImplThread(
|
| LayerAnimationController* controller_impl) const;
|
| - void ReplaceImplThreadAnimations(
|
| - LayerAnimationController* controller_impl) const;
|
|
|
| void StartAnimationsWaitingForNextTick(double monotonic_time);
|
| void StartAnimationsWaitingForStartTime(double monotonic_time);
|
| @@ -146,12 +140,11 @@ class CC_EXPORT LayerAnimationController
|
| void NotifyObserversTransformAnimated(const gfx::Transform& transform);
|
| void NotifyObserversFilterAnimated(const FilterOperations& filter);
|
|
|
| + void NotifyObserversAnimationWaitingForDeletion();
|
| +
|
| bool HasValueObserver();
|
| bool HasActiveValueObserver();
|
|
|
| - // If this is true, we force a sync to the impl thread.
|
| - bool force_sync_;
|
| -
|
| AnimationRegistrar* registrar_;
|
| int id_;
|
| ScopedPtrVector<Animation> active_animations_;
|
|
|