| 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 #include "cc/test/animation_timelines_test_common.h" | 5 #include "cc/test/animation_timelines_test_common.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "cc/animation/animation_events.h" | 8 #include "cc/animation/animation_events.h" |
| 9 #include "cc/animation/animation_id_provider.h" | 9 #include "cc/animation/animation_id_provider.h" |
| 10 #include "cc/animation/animation_player.h" | 10 #include "cc/animation/animation_player.h" |
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 client_impl_.RegisterElement(element_id_, element_list_type); | 375 client_impl_.RegisterElement(element_id_, element_list_type); |
| 376 } | 376 } |
| 377 | 377 |
| 378 void AnimationTimelinesTest::AttachTimelinePlayerLayer() { | 378 void AnimationTimelinesTest::AttachTimelinePlayerLayer() { |
| 379 host_->AddAnimationTimeline(timeline_); | 379 host_->AddAnimationTimeline(timeline_); |
| 380 timeline_->AttachPlayer(player_); | 380 timeline_->AttachPlayer(player_); |
| 381 player_->AttachElement(element_id_); | 381 player_->AttachElement(element_id_); |
| 382 } | 382 } |
| 383 | 383 |
| 384 void AnimationTimelinesTest::CreateImplTimelineAndPlayer() { | 384 void AnimationTimelinesTest::CreateImplTimelineAndPlayer() { |
| 385 host_->PushPropertiesTo(host_impl_); | 385 host_->PushPropertiesTo(host_impl_, base::TimeTicks()); |
| 386 GetImplTimelineAndPlayerByID(); | 386 GetImplTimelineAndPlayerByID(); |
| 387 } | 387 } |
| 388 | 388 |
| 389 scoped_refptr<ElementAnimations> AnimationTimelinesTest::element_animations() | 389 scoped_refptr<ElementAnimations> AnimationTimelinesTest::element_animations() |
| 390 const { | 390 const { |
| 391 DCHECK(player_); | 391 DCHECK(player_); |
| 392 DCHECK(player_->element_animations()); | 392 DCHECK(player_->element_animations()); |
| 393 return player_->element_animations(); | 393 return player_->element_animations(); |
| 394 } | 394 } |
| 395 | 395 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 443 return element_animations ? element_animations->players_list().head()->value() | 443 return element_animations ? element_animations->players_list().head()->value() |
| 444 : nullptr; | 444 : nullptr; |
| 445 } | 445 } |
| 446 | 446 |
| 447 int AnimationTimelinesTest::NextTestLayerId() { | 447 int AnimationTimelinesTest::NextTestLayerId() { |
| 448 next_test_layer_id_++; | 448 next_test_layer_id_++; |
| 449 return next_test_layer_id_; | 449 return next_test_layer_id_; |
| 450 } | 450 } |
| 451 | 451 |
| 452 } // namespace cc | 452 } // namespace cc |
| OLD | NEW |