Web Animations: Sort Animations in the AnimationStack

Source/core/animation/AnimationPlayer.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 38 matching lines @@
 PassRefPtr<AnimationPlayer> AnimationPlayer::create(DocumentTimeline& timeline, TimedItem* content)
 {
     return adoptRef(new AnimationPlayer(timeline, content));
 }
 
 AnimationPlayer::AnimationPlayer(DocumentTimeline& timeline, TimedItem* content)
     : m_playbackRate(1)
     , m_startTime(nullValue())
     , m_holdTime(nullValue())
     , m_storedTimeLag(0)
+    , m_sortInfo(nextSequenceNumber(), timeline.effectiveTime())
     , m_content(content)
     , m_timeline(&timeline)
     , m_paused(false)
     , m_held(false)
     , m_isPausedForTesting(false)
     , m_outdated(false)
-    , m_sequenceNumber(nextSequenceNumber())
 {
     if (m_content) {
         if (m_content->player())
             m_content->player()->cancel();
         m_content->attach(this);
     }
 }
 
 AnimationPlayer::~AnimationPlayer()
 {
@@ skipping 10 matching lines @@
 
 bool AnimationPlayer::limited(double currentTime) const
 {
     return (m_playbackRate < 0 && currentTime <= 0) || (m_playbackRate > 0 && currentTime >= sourceEnd());
 }
 
 double AnimationPlayer::currentTimeWithoutLag() const
 {
     if (isNull(m_startTime) || !m_timeline)
         return 0;
-    double timelineTime = m_timeline->currentTime();
-    if (isNull(timelineTime))
-        timelineTime = 0;
-    return (timelineTime - m_startTime) * m_playbackRate;
+    return (m_timeline->effectiveTime() - m_startTime) * m_playbackRate;
 }
 
 double AnimationPlayer::currentTimeWithLag() const
 {
     ASSERT(!m_held);
     double time = currentTimeWithoutLag();
     return std::isinf(time) ? time : time - m_storedTimeLag;
 }
 
 void AnimationPlayer::updateTimingState(double newCurrentTime)
@@ skipping 40 matching lines @@
         return;
     updateTimingState(newCurrentTime);
 }
 
 void AnimationPlayer::setStartTime(double newStartTime)
 {
     if (!std::isfinite(newStartTime))
         return;
     updateCurrentTimingState(); // Update the value of held
     m_startTime = newStartTime;
+    m_sortInfo.m_startTime = newStartTime;
     if (m_held)
         return;
     updateCurrentTimingState();
     setOutdated();
 }
 
 void AnimationPlayer::setSource(TimedItem* newSource)
 {
     if (m_content == newSource)
         return;
@@ skipping 137 matching lines @@
 void AnimationPlayer::cancel()
 {
     if (!m_content)
         return;
 
     ASSERT(m_content->player() == this);
     m_content->detach();
     m_content = nullptr;
 }
 
-bool AnimationPlayer::hasLowerPriority(AnimationPlayer* player1, AnimationPlayer* player2)
+bool AnimationPlayer::SortInfo::operator<(const SortInfo& other) const
 {
-    if (player1->m_startTime < player2->m_startTime)
+    ASSERT(!std::isnan(m_startTime) && !std::isnan(other.m_startTime));
+    if (m_startTime < other.m_startTime)
         return true;
-    if (player1->m_startTime > player2->m_startTime)
+    if (m_startTime > other.m_startTime)
         return false;
-    if (isNull(player1->m_startTime) != isNull(player2->m_startTime))
-        return isNull(player1->m_startTime);
-    return player1->m_sequenceNumber < player2->m_sequenceNumber;
+    return m_sequenceNumber < other.m_sequenceNumber;
 }
 
 void AnimationPlayer::pauseForTesting(double pauseTime)
 {
     RELEASE_ASSERT(!paused());
     updateTimingState(pauseTime);
     if (!m_isPausedForTesting && hasActiveAnimationsOnCompositor())
         toAnimation(m_content.get())->pauseAnimationForTestingOnCompositor(currentTime());
     m_isPausedForTesting = true;
     pause();
 }
 
 } // namespace