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

Unified Diff: cc/test/animation_timelines_test_common.cc

Issue 1877073006: CC Animation: Make AnimationRegistrar a private member of AnimationHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/animation/layer_animation_controller_unittest.cc ('k') | cc/test/layer_tree_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/animation_timelines_test_common.cc
diff --git a/cc/test/animation_timelines_test_common.cc b/cc/test/animation_timelines_test_common.cc
index 8da1721dc6b2e1a36603dcce4115c33580805ede..1f6fb9b8d66eff8232100a4ae3c7624d5f17fea1 100644
--- a/cc/test/animation_timelines_test_common.cc
+++ b/cc/test/animation_timelines_test_common.cc
@@ -8,7 +8,6 @@
#include "cc/animation/animation_events.h"
#include "cc/animation/animation_id_provider.h"
#include "cc/animation/animation_player.h"
-#include "cc/animation/animation_registrar.h"
#include "cc/animation/animation_timeline.h"
#include "cc/animation/element_animations.h"
#include "cc/output/filter_operation.h"
@@ -235,16 +234,15 @@ void AnimationTimelinesTest::ReleaseRefPtrs() {
void AnimationTimelinesTest::AnimateLayersTransferEvents(
base::TimeTicks time,
unsigned expect_events) {
- std::unique_ptr<AnimationEvents> events =
- host_->animation_registrar()->CreateEvents();
+ std::unique_ptr<AnimationEvents> events = host_->CreateEvents();
- host_impl_->animation_registrar()->AnimateLayers(time);
- host_impl_->animation_registrar()->UpdateAnimationState(true, events.get());
+ host_impl_->AnimateLayers(time);
+ host_impl_->UpdateAnimationState(true, events.get());
EXPECT_EQ(expect_events, events->events_.size());
- host_->animation_registrar()->AnimateLayers(time);
- host_->animation_registrar()->UpdateAnimationState(true, nullptr);
- host_->animation_registrar()->SetAnimationEvents(std::move(events));
+ host_->AnimateLayers(time);
+ host_->UpdateAnimationState(true, nullptr);
+ host_->SetAnimationEvents(std::move(events));
}
AnimationPlayer* AnimationTimelinesTest::GetPlayerForLayerId(int layer_id) {
« no previous file with comments | « cc/animation/layer_animation_controller_unittest.cc ('k') | cc/test/layer_tree_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698