| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #ifndef CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ | 5 #ifndef CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ |
| 6 #define CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ | 6 #define CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <unordered_map> | 9 #include <unordered_map> |
| 10 | 10 |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 int transform_x, | 172 int transform_x, |
| 173 int transform_y) const; | 173 int transform_y) const; |
| 174 | 174 |
| 175 TestLayer* FindTestLayer(ElementId element_id, | 175 TestLayer* FindTestLayer(ElementId element_id, |
| 176 ElementListType list_type) const; | 176 ElementListType list_type) const; |
| 177 | 177 |
| 178 private: | 178 private: |
| 179 std::unique_ptr<AnimationHost> host_; | 179 std::unique_ptr<AnimationHost> host_; |
| 180 | 180 |
| 181 using ElementIdToTestLayer = | 181 using ElementIdToTestLayer = |
| 182 std::unordered_map<ElementId, std::unique_ptr<TestLayer>, ElementIdHash>; | 182 std::unordered_map<ElementId, std::unique_ptr<TestLayer>>; |
| 183 ElementIdToTestLayer layers_in_active_tree_; | 183 ElementIdToTestLayer layers_in_active_tree_; |
| 184 ElementIdToTestLayer layers_in_pending_tree_; | 184 ElementIdToTestLayer layers_in_pending_tree_; |
| 185 | 185 |
| 186 gfx::ScrollOffset scroll_offset_; | 186 gfx::ScrollOffset scroll_offset_; |
| 187 bool mutators_need_commit_; | 187 bool mutators_need_commit_; |
| 188 }; | 188 }; |
| 189 | 189 |
| 190 class TestAnimationDelegate : public AnimationDelegate { | 190 class TestAnimationDelegate : public AnimationDelegate { |
| 191 public: | 191 public: |
| 192 TestAnimationDelegate(); | 192 TestAnimationDelegate(); |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 scoped_refptr<ElementAnimations> element_animations_; | 274 scoped_refptr<ElementAnimations> element_animations_; |
| 275 | 275 |
| 276 scoped_refptr<AnimationTimeline> timeline_impl_; | 276 scoped_refptr<AnimationTimeline> timeline_impl_; |
| 277 scoped_refptr<AnimationPlayer> player_impl_; | 277 scoped_refptr<AnimationPlayer> player_impl_; |
| 278 scoped_refptr<ElementAnimations> element_animations_impl_; | 278 scoped_refptr<ElementAnimations> element_animations_impl_; |
| 279 }; | 279 }; |
| 280 | 280 |
| 281 } // namespace cc | 281 } // namespace cc |
| 282 | 282 |
| 283 #endif // CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ | 283 #endif // CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ |
| OLD | NEW |