| 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/layer_tree_impl.h" | 5 #include "cc/layer_tree_impl.h" |
| 6 | 6 |
| 7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
| 8 #include "cc/animation.h" | 8 #include "cc/animation/animation.h" |
| 9 #include "cc/animation_id_provider.h" | 9 #include "cc/animation/animation_id_provider.h" |
| 10 #include "cc/animation/keyframed_animation_curve.h" |
| 11 #include "cc/animation/scrollbar_animation_controller.h" |
| 10 #include "cc/heads_up_display_layer_impl.h" | 12 #include "cc/heads_up_display_layer_impl.h" |
| 11 #include "cc/keyframed_animation_curve.h" | |
| 12 #include "cc/layer.h" | 13 #include "cc/layer.h" |
| 13 #include "cc/layer_tree_host_common.h" | 14 #include "cc/layer_tree_host_common.h" |
| 14 #include "cc/layer_tree_host_impl.h" | 15 #include "cc/layer_tree_host_impl.h" |
| 15 #include "cc/pinch_zoom_scrollbar.h" | 16 #include "cc/pinch_zoom_scrollbar.h" |
| 16 #include "cc/scrollbar_animation_controller.h" | |
| 17 #include "cc/scrollbar_layer_impl.h" | 17 #include "cc/scrollbar_layer_impl.h" |
| 18 #include "ui/gfx/size_conversions.h" | 18 #include "ui/gfx/size_conversions.h" |
| 19 #include "ui/gfx/vector2d_conversions.h" | 19 #include "ui/gfx/vector2d_conversions.h" |
| 20 | 20 |
| 21 namespace cc { | 21 namespace cc { |
| 22 | 22 |
| 23 LayerTreeImpl::LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl) | 23 LayerTreeImpl::LayerTreeImpl(LayerTreeHostImpl* layer_tree_host_impl) |
| 24 : layer_tree_host_impl_(layer_tree_host_impl), | 24 : layer_tree_host_impl_(layer_tree_host_impl), |
| 25 source_frame_number_(-1), | 25 source_frame_number_(-1), |
| 26 hud_layer_(0), | 26 hud_layer_(0), |
| (...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 StartFadeOutAnimation(PinchZoomScrollbarVertical()); | 655 StartFadeOutAnimation(PinchZoomScrollbarVertical()); |
| 656 } | 656 } |
| 657 | 657 |
| 658 bool LayerTreeImpl::HasPinchZoomScrollbars() const { | 658 bool LayerTreeImpl::HasPinchZoomScrollbars() const { |
| 659 return pinch_zoom_scrollbar_horizontal_layer_id_ != Layer::INVALID_ID && | 659 return pinch_zoom_scrollbar_horizontal_layer_id_ != Layer::INVALID_ID && |
| 660 pinch_zoom_scrollbar_vertical_layer_id_ != Layer::INVALID_ID; | 660 pinch_zoom_scrollbar_vertical_layer_id_ != Layer::INVALID_ID; |
| 661 } | 661 } |
| 662 | 662 |
| 663 | 663 |
| 664 } // namespace cc | 664 } // namespace cc |
| OLD | NEW |