OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/layers/layer_impl.h" | 5 #include "cc/layers/layer_impl.h" |
6 | 6 |
7 #include "base/debug/trace_event.h" | |
8 #include "base/debug/trace_event_argument.h" | |
9 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
10 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "base/trace_event/trace_event.h" |
| 10 #include "base/trace_event/trace_event_argument.h" |
11 #include "cc/animation/animation_registrar.h" | 11 #include "cc/animation/animation_registrar.h" |
12 #include "cc/animation/scrollbar_animation_controller.h" | 12 #include "cc/animation/scrollbar_animation_controller.h" |
13 #include "cc/base/math_util.h" | 13 #include "cc/base/math_util.h" |
14 #include "cc/base/simple_enclosed_region.h" | 14 #include "cc/base/simple_enclosed_region.h" |
15 #include "cc/debug/debug_colors.h" | 15 #include "cc/debug/debug_colors.h" |
16 #include "cc/debug/layer_tree_debug_state.h" | 16 #include "cc/debug/layer_tree_debug_state.h" |
17 #include "cc/debug/micro_benchmark_impl.h" | 17 #include "cc/debug/micro_benchmark_impl.h" |
18 #include "cc/debug/traced_value.h" | 18 #include "cc/debug/traced_value.h" |
19 #include "cc/input/layer_scroll_offset_delegate.h" | 19 #include "cc/input/layer_scroll_offset_delegate.h" |
20 #include "cc/layers/layer_utils.h" | 20 #include "cc/layers/layer_utils.h" |
(...skipping 1587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1608 SetNeedsPushProperties(); | 1608 SetNeedsPushProperties(); |
1609 layer_tree_impl()->set_needs_update_draw_properties(); | 1609 layer_tree_impl()->set_needs_update_draw_properties(); |
1610 if (should_have_render_surface) { | 1610 if (should_have_render_surface) { |
1611 render_surface_ = make_scoped_ptr(new RenderSurfaceImpl(this)); | 1611 render_surface_ = make_scoped_ptr(new RenderSurfaceImpl(this)); |
1612 return; | 1612 return; |
1613 } | 1613 } |
1614 render_surface_.reset(); | 1614 render_surface_.reset(); |
1615 } | 1615 } |
1616 | 1616 |
1617 } // namespace cc | 1617 } // namespace cc |
OLD | NEW |