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 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
348 : client_(ThreadInstance::MAIN), | 348 : client_(ThreadInstance::MAIN), |
349 client_impl_(ThreadInstance::IMPL), | 349 client_impl_(ThreadInstance::IMPL), |
350 host_(nullptr), | 350 host_(nullptr), |
351 host_impl_(nullptr), | 351 host_impl_(nullptr), |
352 timeline_id_(AnimationIdProvider::NextTimelineId()), | 352 timeline_id_(AnimationIdProvider::NextTimelineId()), |
353 player_id_(AnimationIdProvider::NextPlayerId()), | 353 player_id_(AnimationIdProvider::NextPlayerId()), |
354 next_test_layer_id_(0) { | 354 next_test_layer_id_(0) { |
355 host_ = client_.host(); | 355 host_ = client_.host(); |
356 host_impl_ = client_impl_.host(); | 356 host_impl_ = client_impl_.host(); |
357 | 357 |
358 element_id_ = ElementId(NextTestLayerId(), 0); | 358 element_id_ = ElementId(NextTestLayerId()); |
359 } | 359 } |
360 | 360 |
361 AnimationTimelinesTest::~AnimationTimelinesTest() { | 361 AnimationTimelinesTest::~AnimationTimelinesTest() { |
362 } | 362 } |
363 | 363 |
364 void AnimationTimelinesTest::SetUp() { | 364 void AnimationTimelinesTest::SetUp() { |
365 timeline_ = AnimationTimeline::Create(timeline_id_); | 365 timeline_ = AnimationTimeline::Create(timeline_id_); |
366 player_ = AnimationPlayer::Create(player_id_); | 366 player_ = AnimationPlayer::Create(player_id_); |
367 } | 367 } |
368 | 368 |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
488 } | 488 } |
489 | 489 |
490 return result; | 490 return result; |
491 } | 491 } |
492 | 492 |
493 void AnimationTimelinesTest::PushProperties() { | 493 void AnimationTimelinesTest::PushProperties() { |
494 host_->PushPropertiesTo(host_impl_); | 494 host_->PushPropertiesTo(host_impl_); |
495 } | 495 } |
496 | 496 |
497 } // namespace cc | 497 } // namespace cc |
OLD | NEW |