Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: cc/test/animation_timelines_test_common.h

Issue 2335043002: CC Animation: Move animations_ from ElementAnimations to AnimationPlayer. (Closed)
Patch Set: Clean it up harder. Rework UpdateClientAnimationState. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 void AnimateLayersTransferEvents(base::TimeTicks time, 289 void AnimateLayersTransferEvents(base::TimeTicks time,
290 unsigned expect_events); 290 unsigned expect_events);
291 291
292 AnimationPlayer* GetPlayerForElementId(ElementId element_id); 292 AnimationPlayer* GetPlayerForElementId(ElementId element_id);
293 AnimationPlayer* GetImplPlayerForLayerId(ElementId element_id); 293 AnimationPlayer* GetImplPlayerForLayerId(ElementId element_id);
294 294
295 int NextTestLayerId(); 295 int NextTestLayerId();
296 296
297 bool CheckPlayerTimelineNeedsPushProperties(bool needs_push_properties) const; 297 bool CheckPlayerTimelineNeedsPushProperties(bool needs_push_properties) const;
298 298
299 void PushProperties();
300
299 TestHostClient client_; 301 TestHostClient client_;
300 TestHostClient client_impl_; 302 TestHostClient client_impl_;
301 303
302 AnimationHost* host_; 304 AnimationHost* host_;
303 AnimationHost* host_impl_; 305 AnimationHost* host_impl_;
304 306
305 const int timeline_id_; 307 const int timeline_id_;
306 const int player_id_; 308 const int player_id_;
307 ElementId element_id_; 309 ElementId element_id_;
308 310
309 int next_test_layer_id_; 311 int next_test_layer_id_;
310 312
311 scoped_refptr<AnimationTimeline> timeline_; 313 scoped_refptr<AnimationTimeline> timeline_;
312 scoped_refptr<AnimationPlayer> player_; 314 scoped_refptr<AnimationPlayer> player_;
313 315
314 scoped_refptr<AnimationTimeline> timeline_impl_; 316 scoped_refptr<AnimationTimeline> timeline_impl_;
315 scoped_refptr<AnimationPlayer> player_impl_; 317 scoped_refptr<AnimationPlayer> player_impl_;
316 }; 318 };
317 319
318 } // namespace cc 320 } // namespace cc
319 321
320 #endif // CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ 322 #endif // CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698