summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/animation/document_timeline_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/blink/renderer/core/animation/document_timeline_test.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/animation/document_timeline_test.cc66
1 files changed, 33 insertions, 33 deletions
diff --git a/chromium/third_party/blink/renderer/core/animation/document_timeline_test.cc b/chromium/third_party/blink/renderer/core/animation/document_timeline_test.cc
index ec61b4345f5..8efe98ee197 100644
--- a/chromium/third_party/blink/renderer/core/animation/document_timeline_test.cc
+++ b/chromium/third_party/blink/renderer/core/animation/document_timeline_test.cc
@@ -64,7 +64,8 @@ class AnimationDocumentTimelineTest : public PageTestBase {
GetAnimationClock().ResetTimeForTesting();
element = Element::Create(QualifiedName::Null(), document.Get());
platform_timing = new MockPlatformTiming;
- timeline = DocumentTimeline::Create(document.Get(), 0.0, platform_timing);
+ timeline =
+ DocumentTimeline::Create(document.Get(), TimeDelta(), platform_timing);
timeline->ResetForTesting();
ASSERT_EQ(0, timeline->CurrentTimeInternal());
}
@@ -150,7 +151,7 @@ TEST_F(AnimationDocumentTimelineTest, ZeroTime) {
}
TEST_F(AnimationDocumentTimelineTest, PlaybackRateNormal) {
- double zero_time = timeline->ZeroTime();
+ TimeTicks zero_time = timeline->ZeroTime();
bool is_null;
timeline->SetPlaybackRate(1.0);
@@ -171,29 +172,29 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateNormal) {
}
TEST_F(AnimationDocumentTimelineTest, PlaybackRateNormalWithOriginTime) {
- double origin_time_in_ms = -1000000.0;
- timeline = DocumentTimeline::Create(document.Get(), origin_time_in_ms,
- platform_timing);
+ TimeDelta origin_time = TimeDelta::FromSeconds(-1000);
+ timeline =
+ DocumentTimeline::Create(document.Get(), origin_time, platform_timing);
timeline->ResetForTesting();
bool is_null;
EXPECT_EQ(1.0, timeline->PlaybackRate());
- EXPECT_EQ(-1000, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicks() + origin_time, timeline->ZeroTime());
EXPECT_EQ(1000, timeline->CurrentTimeInternal());
EXPECT_EQ(1000, timeline->CurrentTimeInternal(is_null));
EXPECT_FALSE(is_null);
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(100));
- EXPECT_EQ(-1000, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicks() + origin_time, timeline->ZeroTime());
EXPECT_EQ(1100, timeline->CurrentTimeInternal());
EXPECT_EQ(1100, timeline->CurrentTimeInternal(is_null));
EXPECT_FALSE(is_null);
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(200));
- EXPECT_EQ(-1000, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicks() + origin_time, timeline->ZeroTime());
EXPECT_EQ(1200, timeline->CurrentTimeInternal());
EXPECT_EQ(1200, timeline->CurrentTimeInternal(is_null));
EXPECT_FALSE(is_null);
@@ -204,7 +205,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRatePause) {
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(100));
- EXPECT_EQ(0, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicks(), timeline->ZeroTime());
EXPECT_EQ(100, timeline->CurrentTimeInternal());
EXPECT_EQ(100, timeline->CurrentTimeInternal(is_null));
EXPECT_FALSE(is_null);
@@ -213,7 +214,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRatePause) {
EXPECT_EQ(0.0, timeline->PlaybackRate());
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(200));
- EXPECT_EQ(100, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicksFromSeconds(100), timeline->ZeroTime());
EXPECT_EQ(100, timeline->CurrentTimeInternal());
EXPECT_EQ(100, timeline->CurrentTimeInternal(is_null));
@@ -221,7 +222,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRatePause) {
EXPECT_EQ(1.0, timeline->PlaybackRate());
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(400));
- EXPECT_EQ(100, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicksFromSeconds(100), timeline->ZeroTime());
EXPECT_EQ(300, timeline->CurrentTimeInternal());
EXPECT_EQ(300, timeline->CurrentTimeInternal(is_null));
@@ -231,19 +232,19 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRatePause) {
TEST_F(AnimationDocumentTimelineTest, PlaybackRatePauseWithOriginTime) {
bool is_null;
- double origin_time_in_ms = -1000000.0;
- timeline = DocumentTimeline::Create(document.Get(), origin_time_in_ms,
- platform_timing);
+ TimeDelta origin_time = TimeDelta::FromSeconds(-1000);
+ timeline =
+ DocumentTimeline::Create(document.Get(), origin_time, platform_timing);
timeline->ResetForTesting();
- EXPECT_EQ(-1000, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicks() + origin_time, timeline->ZeroTime());
EXPECT_EQ(1000, timeline->CurrentTimeInternal());
EXPECT_EQ(1000, timeline->CurrentTimeInternal(is_null));
EXPECT_FALSE(is_null);
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(100));
- EXPECT_EQ(-1000, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicks() + origin_time, timeline->ZeroTime());
EXPECT_EQ(1100, timeline->CurrentTimeInternal());
EXPECT_EQ(1100, timeline->CurrentTimeInternal(is_null));
EXPECT_FALSE(is_null);
@@ -252,19 +253,19 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRatePauseWithOriginTime) {
EXPECT_EQ(0.0, timeline->PlaybackRate());
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(200));
- EXPECT_EQ(1100, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicksFromSeconds(1100), timeline->ZeroTime());
EXPECT_EQ(1100, timeline->CurrentTimeInternal());
EXPECT_EQ(1100, timeline->CurrentTimeInternal(is_null));
timeline->SetPlaybackRate(1.0);
EXPECT_EQ(1.0, timeline->PlaybackRate());
- EXPECT_EQ(-900, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicksFromSeconds(-900), timeline->ZeroTime());
EXPECT_EQ(1100, timeline->CurrentTimeInternal());
EXPECT_EQ(1100, timeline->CurrentTimeInternal(is_null));
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(400));
- EXPECT_EQ(-900, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicksFromSeconds(-900), timeline->ZeroTime());
EXPECT_EQ(1300, timeline->CurrentTimeInternal());
EXPECT_EQ(1300, timeline->CurrentTimeInternal(is_null));
@@ -276,7 +277,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateSlow) {
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(100));
- EXPECT_EQ(0, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicks(), timeline->ZeroTime());
EXPECT_EQ(100, timeline->CurrentTimeInternal());
EXPECT_EQ(100, timeline->CurrentTimeInternal(is_null));
EXPECT_FALSE(is_null);
@@ -285,7 +286,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateSlow) {
EXPECT_EQ(0.5, timeline->PlaybackRate());
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(300));
- EXPECT_EQ(-100, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicksFromSeconds(-100), timeline->ZeroTime());
EXPECT_EQ(200, timeline->CurrentTimeInternal());
EXPECT_EQ(200, timeline->CurrentTimeInternal(is_null));
@@ -293,7 +294,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateSlow) {
EXPECT_EQ(1.0, timeline->PlaybackRate());
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(400));
- EXPECT_EQ(100, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicksFromSeconds(100), timeline->ZeroTime());
EXPECT_EQ(300, timeline->CurrentTimeInternal());
EXPECT_EQ(300, timeline->CurrentTimeInternal(is_null));
@@ -305,7 +306,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateFast) {
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(100));
- EXPECT_EQ(0, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicks(), timeline->ZeroTime());
EXPECT_EQ(100, timeline->CurrentTimeInternal());
EXPECT_EQ(100, timeline->CurrentTimeInternal(is_null));
EXPECT_FALSE(is_null);
@@ -314,7 +315,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateFast) {
EXPECT_EQ(2.0, timeline->PlaybackRate());
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(300));
- EXPECT_EQ(50, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicksFromSeconds(50), timeline->ZeroTime());
EXPECT_EQ(500, timeline->CurrentTimeInternal());
EXPECT_EQ(500, timeline->CurrentTimeInternal(is_null));
@@ -322,7 +323,7 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateFast) {
EXPECT_EQ(1.0, timeline->PlaybackRate());
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(400));
- EXPECT_EQ(-200, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicksFromSeconds(-200), timeline->ZeroTime());
EXPECT_EQ(600, timeline->CurrentTimeInternal());
EXPECT_EQ(600, timeline->CurrentTimeInternal(is_null));
@@ -332,39 +333,38 @@ TEST_F(AnimationDocumentTimelineTest, PlaybackRateFast) {
TEST_F(AnimationDocumentTimelineTest, PlaybackRateFastWithOriginTime) {
bool is_null;
- double origin_time_in_ms = -1000000.0;
- timeline = DocumentTimeline::Create(document.Get(), origin_time_in_ms,
- platform_timing);
+ timeline = DocumentTimeline::Create(
+ document.Get(), TimeDelta::FromSeconds(-1000), platform_timing);
timeline->ResetForTesting();
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(100));
- EXPECT_EQ(-1000, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicksFromSeconds(-1000), timeline->ZeroTime());
EXPECT_EQ(1100, timeline->CurrentTimeInternal());
EXPECT_EQ(1100, timeline->CurrentTimeInternal(is_null));
EXPECT_FALSE(is_null);
timeline->SetPlaybackRate(2.0);
EXPECT_EQ(2.0, timeline->PlaybackRate());
- EXPECT_EQ(-450, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicksFromSeconds(-450), timeline->ZeroTime());
EXPECT_EQ(1100, timeline->CurrentTimeInternal());
EXPECT_EQ(1100, timeline->CurrentTimeInternal(is_null));
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(300));
- EXPECT_EQ(-450, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicksFromSeconds(-450), timeline->ZeroTime());
EXPECT_EQ(1500, timeline->CurrentTimeInternal());
EXPECT_EQ(1500, timeline->CurrentTimeInternal(is_null));
timeline->SetPlaybackRate(1.0);
EXPECT_EQ(1.0, timeline->PlaybackRate());
- EXPECT_EQ(-1200, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicksFromSeconds(-1200), timeline->ZeroTime());
EXPECT_EQ(1500, timeline->CurrentTimeInternal());
EXPECT_EQ(1500, timeline->CurrentTimeInternal(is_null));
GetAnimationClock().UpdateTime(base::TimeTicks() +
base::TimeDelta::FromSecondsD(400));
- EXPECT_EQ(-1200, timeline->ZeroTime());
+ EXPECT_EQ(TimeTicksFromSeconds(-1200), timeline->ZeroTime());
EXPECT_EQ(1600, timeline->CurrentTimeInternal());
EXPECT_EQ(1600, timeline->CurrentTimeInternal(is_null));
View Lorry Controller Status