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

Unified Diff: Source/core/animation/AnimationClockTest.cpp

Issue 135693003: Defer starting of animations until after compositing update (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reland after fixing flaky tests. Created 6 years, 10 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 | « Source/core/animation/AnimationClock.cpp ('k') | Source/core/animation/DocumentAnimations.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/AnimationClockTest.cpp
diff --git a/Source/core/animation/AnimationClockTest.cpp b/Source/core/animation/AnimationClockTest.cpp
index 248da7badee6ce73eaeed5f7465cf760c1249c03..7e54cde9876530b9e86b72f61c95ff99063dff96 100644
--- a/Source/core/animation/AnimationClockTest.cpp
+++ b/Source/core/animation/AnimationClockTest.cpp
@@ -48,7 +48,7 @@ protected:
static double mockTimeFunction()
{
- return mockTime++;
+ return mockTime;
}
static double mockTime;
@@ -59,21 +59,29 @@ double AnimationAnimationClockTest::mockTime;
TEST_F(AnimationAnimationClockTest, CurrentTime)
{
+ // Current time should not advance until minTimeBeforeUnsynchronizedTick has elapsed
EXPECT_EQ(200, animationClock->currentTime());
+ mockTime = 200 + minTimeBeforeUnsynchronizedAnimationClockTick / 2.0;
EXPECT_EQ(200, animationClock->currentTime());
- animationClock->unfreeze();
- EXPECT_EQ(201, animationClock->currentTime());
- EXPECT_EQ(201, animationClock->currentTime());
+
+ mockTime = 200 + minTimeBeforeUnsynchronizedAnimationClockTick;
+ EXPECT_EQ(mockTime, animationClock->currentTime());
}
TEST_F(AnimationAnimationClockTest, UpdateTime)
{
animationClock->updateTime(100);
EXPECT_EQ(100, animationClock->currentTime());
+ mockTime = 200;
EXPECT_EQ(100, animationClock->currentTime());
- animationClock->updateTime(150);
- EXPECT_EQ(150, animationClock->currentTime());
- EXPECT_EQ(150, animationClock->currentTime());
+
+ animationClock->unfreeze();
+ EXPECT_EQ(200, animationClock->currentTime());
+
+ animationClock->updateTime(300);
+ EXPECT_EQ(300, animationClock->currentTime());
+ mockTime = 400;
+ EXPECT_EQ(300, animationClock->currentTime());
}
}
« no previous file with comments | « Source/core/animation/AnimationClock.cpp ('k') | Source/core/animation/DocumentAnimations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698