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

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

Issue 551253002: Web Animations: Zero time of the document timeline should correspond with navigationStart (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Specify time when resetting animation clock in tests. Created 6 years, 3 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
« no previous file with comments | « Source/core/animation/AnimationClock.h ('k') | Source/core/animation/AnimationTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014, Google Inc. All rights reserved. 2 * Copyright (c) 2014, 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 ASSERT(newTime >= currentTime); 65 ASSERT(newTime >= currentTime);
66 ASSERT(newTime <= currentTime + approximateFrameTime); 66 ASSERT(newTime <= currentTime + approximateFrameTime);
67 updateTime(newTime); 67 updateTime(newTime);
68 } else { 68 } else {
69 m_currentTask = s_currentTask; 69 m_currentTask = s_currentTask;
70 } 70 }
71 } 71 }
72 return m_time; 72 return m_time;
73 } 73 }
74 74
75 void AnimationClock::resetTimeForTesting() 75 void AnimationClock::resetTimeForTesting(double time)
76 { 76 {
77 m_time = 0; 77 m_time = time;
78 m_currentTask = 0; 78 m_currentTask = 0;
79 s_currentTask = 0; 79 s_currentTask = 0;
80 } 80 }
81 81
82 } 82 }
OLDNEW
« no previous file with comments | « Source/core/animation/AnimationClock.h ('k') | Source/core/animation/AnimationTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698