| 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 11 matching lines...) Expand all Loading... |
| 22 #include "cc/output/delegated_frame_data.h" | 22 #include "cc/output/delegated_frame_data.h" |
| 23 #include "cc/output/filter_operation.h" | 23 #include "cc/output/filter_operation.h" |
| 24 #include "cc/output/filter_operations.h" | 24 #include "cc/output/filter_operations.h" |
| 25 #include "cc/resources/transferable_resource.h" | 25 #include "cc/resources/transferable_resource.h" |
| 26 #include "ui/compositor/compositor_switches.h" | 26 #include "ui/compositor/compositor_switches.h" |
| 27 #include "ui/compositor/dip_util.h" | 27 #include "ui/compositor/dip_util.h" |
| 28 #include "ui/compositor/layer_animator.h" | 28 #include "ui/compositor/layer_animator.h" |
| 29 #include "ui/gfx/animation/animation.h" | 29 #include "ui/gfx/animation/animation.h" |
| 30 #include "ui/gfx/canvas.h" | 30 #include "ui/gfx/canvas.h" |
| 31 #include "ui/gfx/display.h" | 31 #include "ui/gfx/display.h" |
| 32 #include "ui/gfx/geometry/point3_f.h" |
| 32 #include "ui/gfx/interpolated_transform.h" | 33 #include "ui/gfx/interpolated_transform.h" |
| 33 #include "ui/gfx/point3_f.h" | |
| 34 #include "ui/gfx/point_conversions.h" | 34 #include "ui/gfx/point_conversions.h" |
| 35 #include "ui/gfx/size_conversions.h" | 35 #include "ui/gfx/size_conversions.h" |
| 36 | 36 |
| 37 namespace { | 37 namespace { |
| 38 | 38 |
| 39 const ui::Layer* GetRoot(const ui::Layer* layer) { | 39 const ui::Layer* GetRoot(const ui::Layer* layer) { |
| 40 while (layer->parent()) | 40 while (layer->parent()) |
| 41 layer = layer->parent(); | 41 layer = layer->parent(); |
| 42 return layer; | 42 return layer; |
| 43 } | 43 } |
| (...skipping 970 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1014 children_.end(), | 1014 children_.end(), |
| 1015 std::bind2nd(std::mem_fun(&Layer::RemoveAnimatorsInTreeFromCollection), | 1015 std::bind2nd(std::mem_fun(&Layer::RemoveAnimatorsInTreeFromCollection), |
| 1016 collection)); | 1016 collection)); |
| 1017 } | 1017 } |
| 1018 | 1018 |
| 1019 bool Layer::IsAnimating() const { | 1019 bool Layer::IsAnimating() const { |
| 1020 return animator_ && animator_->is_animating(); | 1020 return animator_ && animator_->is_animating(); |
| 1021 } | 1021 } |
| 1022 | 1022 |
| 1023 } // namespace ui | 1023 } // namespace ui |
| OLD | NEW |