OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/trees/layer_tree_impl.h" | 5 #include "cc/trees/layer_tree_impl.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "base/debug/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
11 #include "base/debug/trace_event_argument.h" | 11 #include "base/trace_event/trace_event_argument.h" |
12 #include "cc/animation/keyframed_animation_curve.h" | 12 #include "cc/animation/keyframed_animation_curve.h" |
13 #include "cc/animation/scrollbar_animation_controller.h" | 13 #include "cc/animation/scrollbar_animation_controller.h" |
14 #include "cc/animation/scrollbar_animation_controller_linear_fade.h" | 14 #include "cc/animation/scrollbar_animation_controller_linear_fade.h" |
15 #include "cc/animation/scrollbar_animation_controller_thinning.h" | 15 #include "cc/animation/scrollbar_animation_controller_thinning.h" |
16 #include "cc/base/math_util.h" | 16 #include "cc/base/math_util.h" |
17 #include "cc/base/synced_property.h" | 17 #include "cc/base/synced_property.h" |
18 #include "cc/base/util.h" | 18 #include "cc/base/util.h" |
19 #include "cc/debug/devtools_instrumentation.h" | 19 #include "cc/debug/devtools_instrumentation.h" |
20 #include "cc/debug/traced_value.h" | 20 #include "cc/debug/traced_value.h" |
21 #include "cc/input/page_scale_animation.h" | 21 #include "cc/input/page_scale_animation.h" |
(...skipping 1501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1523 scoped_ptr<PendingPageScaleAnimation> pending_animation) { | 1523 scoped_ptr<PendingPageScaleAnimation> pending_animation) { |
1524 pending_page_scale_animation_ = pending_animation.Pass(); | 1524 pending_page_scale_animation_ = pending_animation.Pass(); |
1525 } | 1525 } |
1526 | 1526 |
1527 scoped_ptr<PendingPageScaleAnimation> | 1527 scoped_ptr<PendingPageScaleAnimation> |
1528 LayerTreeImpl::TakePendingPageScaleAnimation() { | 1528 LayerTreeImpl::TakePendingPageScaleAnimation() { |
1529 return pending_page_scale_animation_.Pass(); | 1529 return pending_page_scale_animation_.Pass(); |
1530 } | 1530 } |
1531 | 1531 |
1532 } // namespace cc | 1532 } // namespace cc |
OLD | NEW |