OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "ui/compositor/layer.h" | 5 #include "ui/compositor/layer.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | |
11 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
12 #include "base/lazy_instance.h" | 11 #include "base/lazy_instance.h" |
13 #include "base/logging.h" | 12 #include "base/logging.h" |
14 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "base/trace_event/trace_event.h" |
15 #include "cc/base/scoped_ptr_algorithm.h" | 15 #include "cc/base/scoped_ptr_algorithm.h" |
16 #include "cc/layers/content_layer.h" | 16 #include "cc/layers/content_layer.h" |
17 #include "cc/layers/delegated_renderer_layer.h" | 17 #include "cc/layers/delegated_renderer_layer.h" |
18 #include "cc/layers/nine_patch_layer.h" | 18 #include "cc/layers/nine_patch_layer.h" |
19 #include "cc/layers/picture_layer.h" | 19 #include "cc/layers/picture_layer.h" |
20 #include "cc/layers/solid_color_layer.h" | 20 #include "cc/layers/solid_color_layer.h" |
21 #include "cc/layers/surface_layer.h" | 21 #include "cc/layers/surface_layer.h" |
22 #include "cc/layers/texture_layer.h" | 22 #include "cc/layers/texture_layer.h" |
23 #include "cc/output/copy_output_request.h" | 23 #include "cc/output/copy_output_request.h" |
24 #include "cc/output/delegated_frame_data.h" | 24 #include "cc/output/delegated_frame_data.h" |
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1066 children_.end(), | 1066 children_.end(), |
1067 std::bind2nd(std::mem_fun(&Layer::RemoveAnimatorsInTreeFromCollection), | 1067 std::bind2nd(std::mem_fun(&Layer::RemoveAnimatorsInTreeFromCollection), |
1068 collection)); | 1068 collection)); |
1069 } | 1069 } |
1070 | 1070 |
1071 bool Layer::IsAnimating() const { | 1071 bool Layer::IsAnimating() const { |
1072 return animator_.get() && animator_->is_animating(); | 1072 return animator_.get() && animator_->is_animating(); |
1073 } | 1073 } |
1074 | 1074 |
1075 } // namespace ui | 1075 } // namespace ui |
OLD | NEW |