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 822 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
833 private: | 833 private: |
834 std::string name_; | 834 std::string name_; |
835 }; | 835 }; |
836 | 836 |
837 std::unique_ptr<base::trace_event::ConvertableToTraceFormat> | 837 std::unique_ptr<base::trace_event::ConvertableToTraceFormat> |
838 Layer::TakeDebugInfo(cc::Layer* layer) { | 838 Layer::TakeDebugInfo(cc::Layer* layer) { |
839 return base::WrapUnique(new LayerDebugInfo(name_)); | 839 return base::WrapUnique(new LayerDebugInfo(name_)); |
840 } | 840 } |
841 | 841 |
842 void Layer::didUpdateMainThreadScrollingReasons() {} | 842 void Layer::didUpdateMainThreadScrollingReasons() {} |
| 843 void Layer::didChangeScrollbarsHidden(bool) {} |
843 | 844 |
844 void Layer::CollectAnimators( | 845 void Layer::CollectAnimators( |
845 std::vector<scoped_refptr<LayerAnimator>>* animators) { | 846 std::vector<scoped_refptr<LayerAnimator>>* animators) { |
846 if (animator_ && animator_->is_animating()) | 847 if (animator_ && animator_->is_animating()) |
847 animators->push_back(animator_); | 848 animators->push_back(animator_); |
848 for (auto* child : children_) | 849 for (auto* child : children_) |
849 child->CollectAnimators(animators); | 850 child->CollectAnimators(animators); |
850 } | 851 } |
851 | 852 |
852 void Layer::StackRelativeTo(Layer* child, Layer* other, bool above) { | 853 void Layer::StackRelativeTo(Layer* child, Layer* other, bool above) { |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1070 if (animator_) { | 1071 if (animator_) { |
1071 animator_->DetachLayerAndTimeline(compositor); | 1072 animator_->DetachLayerAndTimeline(compositor); |
1072 animator_->RemoveFromCollection(collection); | 1073 animator_->RemoveFromCollection(collection); |
1073 } | 1074 } |
1074 | 1075 |
1075 for (auto* child : children_) | 1076 for (auto* child : children_) |
1076 child->ResetCompositorForAnimatorsInTree(compositor); | 1077 child->ResetCompositorForAnimatorsInTree(compositor); |
1077 } | 1078 } |
1078 | 1079 |
1079 } // namespace ui | 1080 } // namespace ui |
OLD | NEW |