OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "cc/animation/animation_host.h" | 5 #include "cc/animation/animation_host.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
| 9 #include "base/macros.h" |
9 #include "cc/animation/animation_delegate.h" | 10 #include "cc/animation/animation_delegate.h" |
10 #include "cc/animation/animation_id_provider.h" | 11 #include "cc/animation/animation_id_provider.h" |
11 #include "cc/animation/animation_player.h" | 12 #include "cc/animation/animation_player.h" |
12 #include "cc/animation/animation_registrar.h" | 13 #include "cc/animation/animation_registrar.h" |
13 #include "cc/animation/animation_timeline.h" | 14 #include "cc/animation/animation_timeline.h" |
14 #include "cc/animation/element_animations.h" | 15 #include "cc/animation/element_animations.h" |
15 #include "cc/animation/scroll_offset_animation_curve.h" | 16 #include "cc/animation/scroll_offset_animation_curve.h" |
16 #include "cc/animation/timing_function.h" | 17 #include "cc/animation/timing_function.h" |
17 #include "ui/gfx/geometry/box_f.h" | 18 #include "ui/gfx/geometry/box_f.h" |
18 #include "ui/gfx/geometry/scroll_offset.h" | 19 #include "ui/gfx/geometry/scroll_offset.h" |
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
560 int layer_id, | 561 int layer_id, |
561 const gfx::Vector2dF& scroll_delta, | 562 const gfx::Vector2dF& scroll_delta, |
562 const gfx::ScrollOffset& max_scroll_offset, | 563 const gfx::ScrollOffset& max_scroll_offset, |
563 base::TimeTicks frame_monotonic_time) { | 564 base::TimeTicks frame_monotonic_time) { |
564 DCHECK(scroll_offset_animations_); | 565 DCHECK(scroll_offset_animations_); |
565 return scroll_offset_animations_->ScrollAnimationUpdateTarget( | 566 return scroll_offset_animations_->ScrollAnimationUpdateTarget( |
566 layer_id, scroll_delta, max_scroll_offset, frame_monotonic_time); | 567 layer_id, scroll_delta, max_scroll_offset, frame_monotonic_time); |
567 } | 568 } |
568 | 569 |
569 } // namespace cc | 570 } // namespace cc |
OLD | NEW |