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

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

Issue 399033002: Web Animations: Don't compare start time for AnimationPlayer sorting (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 5 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/AnimationPlayer.h ('k') | Source/core/animation/AnimationPlayerTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/AnimationPlayer.cpp
diff --git a/Source/core/animation/AnimationPlayer.cpp b/Source/core/animation/AnimationPlayer.cpp
index 4ba9adb968f57fa7450ba49b98081ac31234ea34..14c0f547cef8e4efa53e61eff84e2e3ac7ed1609 100644
--- a/Source/core/animation/AnimationPlayer.cpp
+++ b/Source/core/animation/AnimationPlayer.cpp
@@ -62,7 +62,7 @@ AnimationPlayer::AnimationPlayer(ExecutionContext* executionContext, AnimationTi
, m_startTime(nullValue())
, m_holdTime(nullValue())
, m_storedTimeLag(0)
- , m_sortInfo(nextSequenceNumber(), timeline.effectiveTime())
+ , m_sortInfo(nextSequenceNumber())
, m_content(content)
, m_timeline(&timeline)
, m_paused(false)
@@ -183,7 +183,6 @@ void AnimationPlayer::setStartTimeInternal(double newStartTime, bool isUpdateFro
bool hadStartTime = hasStartTime();
double previousCurrentTime = currentTimeInternal();
m_startTime = newStartTime;
- m_sortInfo.m_startTime = newStartTime;
updateCurrentTimingState();
if (previousCurrentTime != currentTimeInternal()) {
setOutdated();
@@ -415,16 +414,6 @@ void AnimationPlayer::cancel()
setSource(0);
}
-bool AnimationPlayer::SortInfo::operator<(const SortInfo& other) const
-{
- ASSERT(!std::isnan(m_startTime) && !std::isnan(other.m_startTime));
- if (m_startTime < other.m_startTime)
- return true;
- if (m_startTime > other.m_startTime)
- return false;
- return m_sequenceNumber < other.m_sequenceNumber;
-}
-
#if !ENABLE(OILPAN)
bool AnimationPlayer::canFree() const
{
« no previous file with comments | « Source/core/animation/AnimationPlayer.h ('k') | Source/core/animation/AnimationPlayerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698