| 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/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_registrar.h" | 10 #include "cc/animation_registrar.h" |
| 11 #include "cc/base/math_util.h" |
| 11 #include "cc/debug_border_draw_quad.h" | 12 #include "cc/debug_border_draw_quad.h" |
| 12 #include "cc/debug_colors.h" | 13 #include "cc/debug_colors.h" |
| 13 #include "cc/layer_tree_debug_state.h" | 14 #include "cc/layer_tree_debug_state.h" |
| 14 #include "cc/layer_tree_impl.h" | 15 #include "cc/layer_tree_impl.h" |
| 15 #include "cc/layer_tree_settings.h" | 16 #include "cc/layer_tree_settings.h" |
| 16 #include "cc/math_util.h" | |
| 17 #include "cc/proxy.h" | 17 #include "cc/proxy.h" |
| 18 #include "cc/quad_sink.h" | 18 #include "cc/quad_sink.h" |
| 19 #include "cc/scrollbar_animation_controller.h" | 19 #include "cc/scrollbar_animation_controller.h" |
| 20 #include "cc/scrollbar_animation_controller_linear_fade.h" | 20 #include "cc/scrollbar_animation_controller_linear_fade.h" |
| 21 #include "cc/scrollbar_layer_impl.h" | 21 #include "cc/scrollbar_layer_impl.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 { |
| (...skipping 925 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 952 | 952 |
| 953 } | 953 } |
| 954 | 954 |
| 955 scoped_ptr<base::Value> LayerImpl::AsValue() const { | 955 scoped_ptr<base::Value> LayerImpl::AsValue() const { |
| 956 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); | 956 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); |
| 957 AsValueInto(state.get()); | 957 AsValueInto(state.get()); |
| 958 return state.PassAs<base::Value>(); | 958 return state.PassAs<base::Value>(); |
| 959 } | 959 } |
| 960 | 960 |
| 961 } // namespace cc | 961 } // namespace cc |
| OLD | NEW |