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" | 10 #include "base/debug/trace_event.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "cc/output/delegated_frame_data.h" | 24 #include "cc/output/delegated_frame_data.h" |
25 #include "cc/output/filter_operation.h" | 25 #include "cc/output/filter_operation.h" |
26 #include "cc/output/filter_operations.h" | 26 #include "cc/output/filter_operations.h" |
27 #include "cc/resources/transferable_resource.h" | 27 #include "cc/resources/transferable_resource.h" |
28 #include "ui/compositor/compositor_switches.h" | 28 #include "ui/compositor/compositor_switches.h" |
29 #include "ui/compositor/dip_util.h" | 29 #include "ui/compositor/dip_util.h" |
30 #include "ui/compositor/layer_animator.h" | 30 #include "ui/compositor/layer_animator.h" |
31 #include "ui/gfx/animation/animation.h" | 31 #include "ui/gfx/animation/animation.h" |
32 #include "ui/gfx/canvas.h" | 32 #include "ui/gfx/canvas.h" |
33 #include "ui/gfx/display.h" | 33 #include "ui/gfx/display.h" |
| 34 #include "ui/gfx/geometry/point3_f.h" |
| 35 #include "ui/gfx/geometry/point_conversions.h" |
34 #include "ui/gfx/interpolated_transform.h" | 36 #include "ui/gfx/interpolated_transform.h" |
35 #include "ui/gfx/point3_f.h" | |
36 #include "ui/gfx/point_conversions.h" | |
37 #include "ui/gfx/size_conversions.h" | 37 #include "ui/gfx/size_conversions.h" |
38 | 38 |
39 namespace { | 39 namespace { |
40 | 40 |
41 const ui::Layer* GetRoot(const ui::Layer* layer) { | 41 const ui::Layer* GetRoot(const ui::Layer* layer) { |
42 while (layer->parent()) | 42 while (layer->parent()) |
43 layer = layer->parent(); | 43 layer = layer->parent(); |
44 return layer; | 44 return layer; |
45 } | 45 } |
46 | 46 |
(...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1056 children_.end(), | 1056 children_.end(), |
1057 std::bind2nd(std::mem_fun(&Layer::RemoveAnimatorsInTreeFromCollection), | 1057 std::bind2nd(std::mem_fun(&Layer::RemoveAnimatorsInTreeFromCollection), |
1058 collection)); | 1058 collection)); |
1059 } | 1059 } |
1060 | 1060 |
1061 bool Layer::IsAnimating() const { | 1061 bool Layer::IsAnimating() const { |
1062 return animator_.get() && animator_->is_animating(); | 1062 return animator_.get() && animator_->is_animating(); |
1063 } | 1063 } |
1064 | 1064 |
1065 } // namespace ui | 1065 } // namespace ui |
OLD | NEW |