Revert r160071 "Web Animations: Implement AnimationClock and fix start time of animations"

Source/core/animation/DocumentTimeline.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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/animation/DocumentTimeline.h"
 
-#include "core/animation/AnimationClock.h"
 #include "core/animation/Player.h"
 #include "core/dom/Document.h"
 #include "core/frame/FrameView.h"
 
 namespace WebCore {
 
 PassRefPtr<DocumentTimeline> DocumentTimeline::create(Document* document)
 {
     return adoptRef(new DocumentTimeline(document));
 }
 
 DocumentTimeline::DocumentTimeline(Document* document)
-    : m_document(document)
+    : m_currentTime(nullValue())
+    , m_document(document)
     , m_zeroTimeAsPerfTime(nullValue())
 {
     ASSERT(document);
 }
 
 PassRefPtr<Player> DocumentTimeline::play(TimedItem* child)
 {
     RefPtr<Player> player = Player::create(this, child);
     m_players.append(player);
 
     if (m_document->view())
         m_document->view()->scheduleAnimation();
 
     return player.release();
 }
 
 void DocumentTimeline::serviceAnimations(double monotonicAnimationStartTime)
 {
     {
         TRACE_EVENT0("webkit", "DocumentTimeline::serviceAnimations");
-
-        m_document->animationClock().updateTime(monotonicAnimationStartTime);
+        // FIXME: The below ASSERT fires on Windows when running chrome.exe.
+        // Does not fire with --single-process, or on Linux, or in
+        // content_shell.exe. The assert condition has been moved up into the
+        // outer 'if' to work around this. http://crbug.com/280439.
+        if (!isNull(m_zeroTimeAsPerfTime) && (m_currentTime <= monotonicAnimationStartTime - m_zeroTimeAsPerfTime)) {
+            ASSERT(m_currentTime <= monotonicAnimationStartTime - m_zeroTimeAsPerfTime);
+            m_currentTime = monotonicAnimationStartTime - m_zeroTimeAsPerfTime;
+        }
 
         double timeToNextEffect = -1;
         for (int i = m_players.size() - 1; i >= 0; --i) {
             if (!m_players[i]->update(&timeToNextEffect))
                 m_players.remove(i);
         }
 
         if (m_document->view() && !m_players.isEmpty())
             m_document->view()->scheduleAnimation();
     }
 
     dispatchEvents();
 }
 
 void DocumentTimeline::setZeroTimeAsPerfTime(double zeroTime)
 {
     ASSERT(isNull(m_zeroTimeAsPerfTime));
     m_zeroTimeAsPerfTime = zeroTime;
     ASSERT(!isNull(m_zeroTimeAsPerfTime));
-}
-
-double DocumentTimeline::currentTime()
-{
-    return m_document->animationClock().currentTime() - m_zeroTimeAsPerfTime;
+    m_currentTime = 0;
 }
 
 void DocumentTimeline::pauseAnimationsForTesting(double pauseTime)
 {
     for (size_t i = 0; i < m_players.size(); i++) {
         m_players[i]->setPaused(true);
         m_players[i]->setCurrentTime(pauseTime);
     }
 }
 
 void DocumentTimeline::dispatchEvents()
 {
     Vector<EventToDispatch> events = m_events;
     m_events.clear();
     for (size_t i = 0; i < events.size(); i++)
         events[i].target->dispatchEvent(events[i].event.release());
 }
 
 size_t DocumentTimeline::numberOfActiveAnimationsForTesting() const
 {
     // Includes all players whose directly associated timed items
     // are current or in effect.
-    return isNull(m_zeroTimeAsPerfTime) ? 0 : m_players.size();
+    return isNull(m_currentTime) ? 0 : m_players.size();
 }
 
 } // namespace