| 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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 379 if (needs_pending_value_observations) | 379 if (needs_pending_value_observations) |
| 380 CreateTestImplLayer(ElementListType::PENDING); | 380 CreateTestImplLayer(ElementListType::PENDING); |
| 381 if (needs_active_value_observations) | 381 if (needs_active_value_observations) |
| 382 CreateTestImplLayer(ElementListType::ACTIVE); | 382 CreateTestImplLayer(ElementListType::ACTIVE); |
| 383 } | 383 } |
| 384 | 384 |
| 385 void AnimationTimelinesTest::CreateTestMainLayer() { | 385 void AnimationTimelinesTest::CreateTestMainLayer() { |
| 386 client_.RegisterElement(element_id_, ElementListType::ACTIVE); | 386 client_.RegisterElement(element_id_, ElementListType::ACTIVE); |
| 387 } | 387 } |
| 388 | 388 |
| 389 void AnimationTimelinesTest::DestroyTestMainLayer() { |
| 390 client_.UnregisterElement(element_id_, ElementListType::ACTIVE); |
| 391 } |
| 392 |
| 389 void AnimationTimelinesTest::CreateTestImplLayer( | 393 void AnimationTimelinesTest::CreateTestImplLayer( |
| 390 ElementListType element_list_type) { | 394 ElementListType element_list_type) { |
| 391 client_impl_.RegisterElement(element_id_, element_list_type); | 395 client_impl_.RegisterElement(element_id_, element_list_type); |
| 392 } | 396 } |
| 393 | 397 |
| 394 void AnimationTimelinesTest::AttachTimelinePlayerLayer() { | 398 void AnimationTimelinesTest::AttachTimelinePlayerLayer() { |
| 395 host_->AddAnimationTimeline(timeline_); | 399 host_->AddAnimationTimeline(timeline_); |
| 396 timeline_->AttachPlayer(player_); | 400 timeline_->AttachPlayer(player_); |
| 397 player_->AttachElement(element_id_); | 401 player_->AttachElement(element_id_); |
| 398 | 402 |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 484 } | 488 } |
| 485 | 489 |
| 486 return result; | 490 return result; |
| 487 } | 491 } |
| 488 | 492 |
| 489 void AnimationTimelinesTest::PushProperties() { | 493 void AnimationTimelinesTest::PushProperties() { |
| 490 host_->PushPropertiesTo(host_impl_); | 494 host_->PushPropertiesTo(host_impl_); |
| 491 } | 495 } |
| 492 | 496 |
| 493 } // namespace cc | 497 } // namespace cc |
| OLD | NEW |