| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/compositor/layer_animator.h" | 5 #include "ui/compositor/layer_animator.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/trace_event/trace_event.h" | 11 #include "base/trace_event/trace_event.h" |
| 12 #include "cc/animation/animation_events.h" | 12 #include "cc/animation/animation_events.h" |
| 13 #include "cc/animation/animation_host.h" | 13 #include "cc/animation/animation_host.h" |
| 14 #include "cc/animation/animation_id_provider.h" | 14 #include "cc/animation/animation_id_provider.h" |
| 15 #include "cc/animation/animation_player.h" | 15 #include "cc/animation/animation_player.h" |
| 16 #include "cc/animation/animation_registrar.h" | 16 #include "cc/animation/animation_registrar.h" |
| 17 #include "cc/animation/animation_timeline.h" | 17 #include "cc/animation/animation_timeline.h" |
| 18 #include "cc/animation/element_animations.h" | 18 #include "cc/animation/element_animations.h" |
| 19 #include "cc/animation/layer_animation_controller.h" | 19 #include "cc/animation/layer_animation_controller.h" |
| 20 #include "cc/layers/layer_settings.h" | |
| 21 #include "cc/output/begin_frame_args.h" | 20 #include "cc/output/begin_frame_args.h" |
| 22 #include "ui/compositor/compositor.h" | 21 #include "ui/compositor/compositor.h" |
| 23 #include "ui/compositor/layer.h" | 22 #include "ui/compositor/layer.h" |
| 24 #include "ui/compositor/layer_animation_delegate.h" | 23 #include "ui/compositor/layer_animation_delegate.h" |
| 25 #include "ui/compositor/layer_animation_observer.h" | 24 #include "ui/compositor/layer_animation_observer.h" |
| 26 #include "ui/compositor/layer_animation_sequence.h" | 25 #include "ui/compositor/layer_animation_sequence.h" |
| 27 #include "ui/compositor/layer_animator_collection.h" | 26 #include "ui/compositor/layer_animator_collection.h" |
| 28 | 27 |
| 29 #define SAFE_INVOKE_VOID(function, running_anim, ...) \ | 28 #define SAFE_INVOKE_VOID(function, running_anim, ...) \ |
| 30 if (running_anim.is_sequence_alive()) \ | 29 if (running_anim.is_sequence_alive()) \ |
| (...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 964 const base::WeakPtr<LayerAnimationSequence>& sequence) | 963 const base::WeakPtr<LayerAnimationSequence>& sequence) |
| 965 : sequence_(sequence) { | 964 : sequence_(sequence) { |
| 966 } | 965 } |
| 967 | 966 |
| 968 LayerAnimator::RunningAnimation::RunningAnimation( | 967 LayerAnimator::RunningAnimation::RunningAnimation( |
| 969 const RunningAnimation& other) = default; | 968 const RunningAnimation& other) = default; |
| 970 | 969 |
| 971 LayerAnimator::RunningAnimation::~RunningAnimation() { } | 970 LayerAnimator::RunningAnimation::~RunningAnimation() { } |
| 972 | 971 |
| 973 } // namespace ui | 972 } // namespace ui |
| OLD | NEW |