| 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 #include <memory> | 8 #include <memory> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "cc/output/filter_operations.h" | 24 #include "cc/output/filter_operations.h" |
| 25 #include "cc/playback/display_item_list_settings.h" | 25 #include "cc/playback/display_item_list_settings.h" |
| 26 #include "cc/resources/transferable_resource.h" | 26 #include "cc/resources/transferable_resource.h" |
| 27 #include "cc/trees/layer_tree_settings.h" | 27 #include "cc/trees/layer_tree_settings.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/compositor/paint_context.h" | 31 #include "ui/compositor/paint_context.h" |
| 32 #include "ui/gfx/animation/animation.h" | 32 #include "ui/gfx/animation/animation.h" |
| 33 #include "ui/gfx/canvas.h" | 33 #include "ui/gfx/canvas.h" |
| 34 #include "ui/gfx/display.h" | |
| 35 #include "ui/gfx/geometry/point3_f.h" | 34 #include "ui/gfx/geometry/point3_f.h" |
| 36 #include "ui/gfx/geometry/point_conversions.h" | 35 #include "ui/gfx/geometry/point_conversions.h" |
| 37 #include "ui/gfx/geometry/size_conversions.h" | 36 #include "ui/gfx/geometry/size_conversions.h" |
| 38 #include "ui/gfx/interpolated_transform.h" | 37 #include "ui/gfx/interpolated_transform.h" |
| 39 | 38 |
| 40 namespace { | 39 namespace { |
| 41 | 40 |
| 42 const ui::Layer* GetRoot(const ui::Layer* layer) { | 41 const ui::Layer* GetRoot(const ui::Layer* layer) { |
| 43 while (layer->parent()) | 42 while (layer->parent()) |
| 44 layer = layer->parent(); | 43 layer = layer->parent(); |
| (...skipping 971 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1016 if (animator_) { | 1015 if (animator_) { |
| 1017 animator_->ResetCompositor(compositor); | 1016 animator_->ResetCompositor(compositor); |
| 1018 animator_->RemoveFromCollection(collection); | 1017 animator_->RemoveFromCollection(collection); |
| 1019 } | 1018 } |
| 1020 | 1019 |
| 1021 for (auto* child : children_) | 1020 for (auto* child : children_) |
| 1022 child->ResetCompositorForAnimatorsInTree(compositor); | 1021 child->ResetCompositorForAnimatorsInTree(compositor); |
| 1023 } | 1022 } |
| 1024 | 1023 |
| 1025 } // namespace ui | 1024 } // namespace ui |
| OLD | NEW |