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

Side by Side Diff: Source/core/animation/AnimationTimelineTest.cpp

Issue 847283004: Web Animations: Simplify mutable AnimationTimeline currentTime and playbackRate (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase. Created 5 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013, Google Inc. All rights reserved. 2 * Copyright (c) 2013, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 document->animationClock().updateTime(200); 204 document->animationClock().updateTime(200);
205 EXPECT_EQ(zeroTime, timeline->zeroTime()); 205 EXPECT_EQ(zeroTime, timeline->zeroTime());
206 EXPECT_EQ(200, timeline->currentTimeInternal()); 206 EXPECT_EQ(200, timeline->currentTimeInternal());
207 EXPECT_EQ(200, timeline->currentTimeInternal(isNull)); 207 EXPECT_EQ(200, timeline->currentTimeInternal(isNull));
208 EXPECT_FALSE(isNull); 208 EXPECT_FALSE(isNull);
209 } 209 }
210 210
211 TEST_F(AnimationAnimationTimelineTest, PlaybackRatePause) 211 TEST_F(AnimationAnimationTimelineTest, PlaybackRatePause)
212 { 212 {
213 timeline = AnimationTimeline::create(document.get()); 213 timeline = AnimationTimeline::create(document.get());
214 double zeroTime = timeline->zeroTime();
215 bool isNull; 214 bool isNull;
216 215
217 document->animationClock().updateTime(100); 216 document->animationClock().updateTime(100);
218 EXPECT_EQ(zeroTime, timeline->zeroTime()); 217 EXPECT_EQ(0, timeline->zeroTime());
219 EXPECT_EQ(100, timeline->currentTimeInternal()); 218 EXPECT_EQ(100, timeline->currentTimeInternal());
220 EXPECT_EQ(100, timeline->currentTimeInternal(isNull)); 219 EXPECT_EQ(100, timeline->currentTimeInternal(isNull));
221 EXPECT_FALSE(isNull); 220 EXPECT_FALSE(isNull);
222 221
223 timeline->setPlaybackRate(0.0); 222 timeline->setPlaybackRate(0.0);
224 EXPECT_EQ(0.0, timeline->playbackRate()); 223 EXPECT_EQ(0.0, timeline->playbackRate());
225 document->animationClock().updateTime(200); 224 document->animationClock().updateTime(200);
226 EXPECT_EQ(zeroTime, timeline->zeroTime()); 225 EXPECT_EQ(100, timeline->zeroTime());
227 EXPECT_EQ(100, timeline->currentTimeInternal()); 226 EXPECT_EQ(100, timeline->currentTimeInternal());
228 EXPECT_EQ(100, timeline->currentTimeInternal(isNull)); 227 EXPECT_EQ(100, timeline->currentTimeInternal(isNull));
229 228
230 timeline->setPlaybackRate(1.0); 229 timeline->setPlaybackRate(1.0);
231 EXPECT_EQ(1.0, timeline->playbackRate()); 230 EXPECT_EQ(1.0, timeline->playbackRate());
232 document->animationClock().updateTime(400); 231 document->animationClock().updateTime(400);
233 EXPECT_EQ(zeroTime + 100, timeline->zeroTime()); 232 EXPECT_EQ(100, timeline->zeroTime());
234 EXPECT_EQ(300, timeline->currentTimeInternal()); 233 EXPECT_EQ(300, timeline->currentTimeInternal());
235 EXPECT_EQ(300, timeline->currentTimeInternal(isNull)); 234 EXPECT_EQ(300, timeline->currentTimeInternal(isNull));
236 235
237 EXPECT_FALSE(isNull); 236 EXPECT_FALSE(isNull);
238 } 237 }
239 238
240 TEST_F(AnimationAnimationTimelineTest, PlaybackRateSlow) 239 TEST_F(AnimationAnimationTimelineTest, PlaybackRateSlow)
241 { 240 {
242 timeline = AnimationTimeline::create(document.get()); 241 timeline = AnimationTimeline::create(document.get());
243 double zeroTime = timeline->zeroTime();
244 bool isNull; 242 bool isNull;
245 243
246 document->animationClock().updateTime(100); 244 document->animationClock().updateTime(100);
247 EXPECT_EQ(zeroTime, timeline->zeroTime()); 245 EXPECT_EQ(0, timeline->zeroTime());
248 EXPECT_EQ(100, timeline->currentTimeInternal()); 246 EXPECT_EQ(100, timeline->currentTimeInternal());
249 EXPECT_EQ(100, timeline->currentTimeInternal(isNull)); 247 EXPECT_EQ(100, timeline->currentTimeInternal(isNull));
250 EXPECT_FALSE(isNull); 248 EXPECT_FALSE(isNull);
251 249
252 timeline->setPlaybackRate(0.5); 250 timeline->setPlaybackRate(0.5);
253 EXPECT_EQ(0.5, timeline->playbackRate()); 251 EXPECT_EQ(0.5, timeline->playbackRate());
254 document->animationClock().updateTime(300); 252 document->animationClock().updateTime(300);
255 EXPECT_EQ(zeroTime, timeline->zeroTime()); 253 EXPECT_EQ(-100, timeline->zeroTime());
256 EXPECT_EQ(200, timeline->currentTimeInternal()); 254 EXPECT_EQ(200, timeline->currentTimeInternal());
257 EXPECT_EQ(200, timeline->currentTimeInternal(isNull)); 255 EXPECT_EQ(200, timeline->currentTimeInternal(isNull));
258 256
259 timeline->setPlaybackRate(1.0); 257 timeline->setPlaybackRate(1.0);
260 EXPECT_EQ(1.0, timeline->playbackRate()); 258 EXPECT_EQ(1.0, timeline->playbackRate());
261 document->animationClock().updateTime(400); 259 document->animationClock().updateTime(400);
262 EXPECT_EQ(zeroTime + 100, timeline->zeroTime()); 260 EXPECT_EQ(100, timeline->zeroTime());
263 EXPECT_EQ(300, timeline->currentTimeInternal()); 261 EXPECT_EQ(300, timeline->currentTimeInternal());
264 EXPECT_EQ(300, timeline->currentTimeInternal(isNull)); 262 EXPECT_EQ(300, timeline->currentTimeInternal(isNull));
265 263
266 EXPECT_FALSE(isNull); 264 EXPECT_FALSE(isNull);
267 } 265 }
268 266
269 TEST_F(AnimationAnimationTimelineTest, PlaybackRateFast) 267 TEST_F(AnimationAnimationTimelineTest, PlaybackRateFast)
270 { 268 {
271 timeline = AnimationTimeline::create(document.get()); 269 timeline = AnimationTimeline::create(document.get());
272 double zeroTime = timeline->zeroTime();
273 bool isNull; 270 bool isNull;
274 271
275 document->animationClock().updateTime(100); 272 document->animationClock().updateTime(100);
276 EXPECT_EQ(zeroTime, timeline->zeroTime()); 273 EXPECT_EQ(0, timeline->zeroTime());
277 EXPECT_EQ(100, timeline->currentTimeInternal()); 274 EXPECT_EQ(100, timeline->currentTimeInternal());
278 EXPECT_EQ(100, timeline->currentTimeInternal(isNull)); 275 EXPECT_EQ(100, timeline->currentTimeInternal(isNull));
279 EXPECT_FALSE(isNull); 276 EXPECT_FALSE(isNull);
280 277
281 timeline->setPlaybackRate(2.0); 278 timeline->setPlaybackRate(2.0);
282 EXPECT_EQ(2.0, timeline->playbackRate()); 279 EXPECT_EQ(2.0, timeline->playbackRate());
283 document->animationClock().updateTime(300); 280 document->animationClock().updateTime(300);
284 EXPECT_EQ(zeroTime, timeline->zeroTime()); 281 EXPECT_EQ(50, timeline->zeroTime());
285 EXPECT_EQ(500, timeline->currentTimeInternal()); 282 EXPECT_EQ(500, timeline->currentTimeInternal());
286 EXPECT_EQ(500, timeline->currentTimeInternal(isNull)); 283 EXPECT_EQ(500, timeline->currentTimeInternal(isNull));
287 284
288 timeline->setPlaybackRate(1.0); 285 timeline->setPlaybackRate(1.0);
289 EXPECT_EQ(1.0, timeline->playbackRate()); 286 EXPECT_EQ(1.0, timeline->playbackRate());
290 document->animationClock().updateTime(400); 287 document->animationClock().updateTime(400);
291 EXPECT_EQ(zeroTime - 200, timeline->zeroTime()); 288 EXPECT_EQ(-200, timeline->zeroTime());
292 EXPECT_EQ(600, timeline->currentTimeInternal()); 289 EXPECT_EQ(600, timeline->currentTimeInternal());
293 EXPECT_EQ(600, timeline->currentTimeInternal(isNull)); 290 EXPECT_EQ(600, timeline->currentTimeInternal(isNull));
294 291
295 EXPECT_FALSE(isNull); 292 EXPECT_FALSE(isNull);
296 } 293 }
297 294
298 TEST_F(AnimationAnimationTimelineTest, SetCurrentTime) 295 TEST_F(AnimationAnimationTimelineTest, SetCurrentTime)
299 { 296 {
300 timeline = AnimationTimeline::create(document.get()); 297 timeline = AnimationTimeline::create(document.get());
301 double zeroTime = timeline->zeroTime(); 298 double zeroTime = timeline->zeroTime();
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 395
399 TEST_F(AnimationAnimationTimelineTest, UseAnimationPlayerAfterTimelineDeref) 396 TEST_F(AnimationAnimationTimelineTest, UseAnimationPlayerAfterTimelineDeref)
400 { 397 {
401 RefPtrWillBeRawPtr<AnimationPlayer> player = timeline->createAnimationPlayer (0); 398 RefPtrWillBeRawPtr<AnimationPlayer> player = timeline->createAnimationPlayer (0);
402 timeline.clear(); 399 timeline.clear();
403 // Test passes if this does not crash. 400 // Test passes if this does not crash.
404 player->setStartTime(0); 401 player->setStartTime(0);
405 } 402 }
406 403
407 } 404 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698