| 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 798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 809 | 809 |
| 810 private: | 810 private: |
| 811 std::string name_; | 811 std::string name_; |
| 812 }; | 812 }; |
| 813 | 813 |
| 814 std::unique_ptr<base::trace_event::ConvertableToTraceFormat> | 814 std::unique_ptr<base::trace_event::ConvertableToTraceFormat> |
| 815 Layer::TakeDebugInfo(cc::Layer* layer) { | 815 Layer::TakeDebugInfo(cc::Layer* layer) { |
| 816 return base::WrapUnique(new LayerDebugInfo(name_)); | 816 return base::WrapUnique(new LayerDebugInfo(name_)); |
| 817 } | 817 } |
| 818 | 818 |
| 819 void Layer::didUpdateMainThreadScrollingReasons() {} |
| 820 |
| 819 void Layer::CollectAnimators( | 821 void Layer::CollectAnimators( |
| 820 std::vector<scoped_refptr<LayerAnimator>>* animators) { | 822 std::vector<scoped_refptr<LayerAnimator>>* animators) { |
| 821 if (animator_ && animator_->is_animating()) | 823 if (animator_ && animator_->is_animating()) |
| 822 animators->push_back(animator_); | 824 animators->push_back(animator_); |
| 823 for (auto* child : children_) | 825 for (auto* child : children_) |
| 824 child->CollectAnimators(animators); | 826 child->CollectAnimators(animators); |
| 825 } | 827 } |
| 826 | 828 |
| 827 void Layer::StackRelativeTo(Layer* child, Layer* other, bool above) { | 829 void Layer::StackRelativeTo(Layer* child, Layer* other, bool above) { |
| 828 DCHECK_NE(child, other); | 830 DCHECK_NE(child, other); |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1058 if (animator_) { | 1060 if (animator_) { |
| 1059 animator_->ResetCompositor(compositor); | 1061 animator_->ResetCompositor(compositor); |
| 1060 animator_->RemoveFromCollection(collection); | 1062 animator_->RemoveFromCollection(collection); |
| 1061 } | 1063 } |
| 1062 | 1064 |
| 1063 for (auto* child : children_) | 1065 for (auto* child : children_) |
| 1064 child->ResetCompositorForAnimatorsInTree(compositor); | 1066 child->ResetCompositorForAnimatorsInTree(compositor); |
| 1065 } | 1067 } |
| 1066 | 1068 |
| 1067 } // namespace ui | 1069 } // namespace ui |
| OLD | NEW |