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_impl.h" | 5 #include "cc/layers/layer_impl.h" |
6 | 6 |
7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "cc/animation/animation_registrar.h" | 10 #include "cc/animation/animation_registrar.h" |
11 #include "cc/animation/scrollbar_animation_controller.h" | 11 #include "cc/animation/scrollbar_animation_controller.h" |
12 #include "cc/animation/scrollbar_animation_controller_linear_fade.h" | 12 #include "cc/animation/scrollbar_animation_controller_linear_fade.h" |
13 #include "cc/base/math_util.h" | 13 #include "cc/base/math_util.h" |
14 #include "cc/debug/debug_colors.h" | 14 #include "cc/debug/debug_colors.h" |
15 #include "cc/debug/layer_tree_debug_state.h" | 15 #include "cc/debug/layer_tree_debug_state.h" |
16 #include "cc/quad_sink.h" | 16 #include "cc/layers/quad_sink.h" |
| 17 #include "cc/layers/scrollbar_layer_impl.h" |
17 #include "cc/quads/debug_border_draw_quad.h" | 18 #include "cc/quads/debug_border_draw_quad.h" |
18 #include "cc/scrollbar_layer_impl.h" | |
19 #include "cc/trees/layer_tree_impl.h" | 19 #include "cc/trees/layer_tree_impl.h" |
20 #include "cc/trees/layer_tree_settings.h" | 20 #include "cc/trees/layer_tree_settings.h" |
21 #include "cc/trees/proxy.h" | 21 #include "cc/trees/proxy.h" |
22 #include "ui/gfx/point_conversions.h" | 22 #include "ui/gfx/point_conversions.h" |
23 #include "ui/gfx/quad_f.h" | 23 #include "ui/gfx/quad_f.h" |
24 #include "ui/gfx/rect_conversions.h" | 24 #include "ui/gfx/rect_conversions.h" |
25 | 25 |
26 namespace cc { | 26 namespace cc { |
27 | 27 |
28 LayerImpl::LayerImpl(LayerTreeImpl* tree_impl, int id) | 28 LayerImpl::LayerImpl(LayerTreeImpl* tree_impl, int id) |
(...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
957 | 957 |
958 } | 958 } |
959 | 959 |
960 scoped_ptr<base::Value> LayerImpl::AsValue() const { | 960 scoped_ptr<base::Value> LayerImpl::AsValue() const { |
961 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); | 961 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); |
962 AsValueInto(state.get()); | 962 AsValueInto(state.get()); |
963 return state.PassAs<base::Value>(); | 963 return state.PassAs<base::Value>(); |
964 } | 964 } |
965 | 965 |
966 } // namespace cc | 966 } // namespace cc |
OLD | NEW |