Merge 116554 - [chromium] Add impl-thread support for fill-mode and direction css animation propert…

Source/WebCore/platform/graphics/chromium/cc/CCActiveAnimation.cpp

 /*
  * Copyright (C) 2012 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:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 27 matching lines @@
 }
 
 CCActiveAnimation::CCActiveAnimation(PassOwnPtr<CCAnimationCurve> curve, int animationId, int groupId, TargetProperty targetProperty)
     : m_curve(curve)
     , m_id(animationId)
     , m_group(groupId)
     , m_targetProperty(targetProperty)
     , m_runState(WaitingForTargetAvailability)
     , m_iterations(1)
     , m_startTime(0)
+    , m_alternatesDirection(false)
     , m_timeOffset(0)
     , m_needsSynchronizedStartTime(false)
     , m_suspended(false)
     , m_pauseTime(0)
     , m_totalPausedTime(0)
 {
 }
 
 CCActiveAnimation::~CCActiveAnimation()
 {
@@ skipping 54 matching lines @@
 
     // Always return zero if we have no iterations.
     if (!m_iterations)
         return 0;
 
     // If less than an iteration duration, just return trimmed.
     if (trimmed < m_curve->duration())
         return trimmed;
 
     // If greater than or equal to the total duration, return iteration duration.
-    if (m_iterations >= 0 && trimmed >= m_curve->duration() * m_iterations)
+    if (m_iterations >= 0 && trimmed >= m_curve->duration() * m_iterations) {
+        if (m_alternatesDirection && !(m_iterations % 2))
+            return 0;
         return m_curve->duration();
+    }
 
-    // Finally, return x where trimmed = x + n * m_animation->duration() for some positive integer n.
-    return fmod(trimmed, m_curve->duration());
+    // We need to know the current iteration if we're alternating.
+    int iteration = static_cast<int>(trimmed / m_curve->duration());
+
+    // Calculate x where trimmed = x + n * m_curve->duration() for some positive integer n.
+    trimmed = fmod(trimmed, m_curve->duration());
+
+    // If we're alternating and on an odd iteration, reverse the direction.
+    if (m_alternatesDirection && iteration % 2 == 1)
+        return m_curve->duration() - trimmed;
+
+    return trimmed;
 }
 
 PassOwnPtr<CCActiveAnimation> CCActiveAnimation::cloneForImplThread() const
 {
     OwnPtr<CCActiveAnimation> toReturn(adoptPtr(new CCActiveAnimation(m_curve->clone(), m_id, m_group, m_targetProperty)));
     toReturn->m_runState = m_runState;
     toReturn->m_iterations = m_iterations;
     toReturn->m_startTime = m_startTime;
     toReturn->m_pauseTime = m_pauseTime;
     toReturn->m_totalPausedTime = m_totalPausedTime;
     toReturn->m_timeOffset = m_timeOffset;
+    toReturn->m_alternatesDirection = m_alternatesDirection;
     return toReturn.release();
 }
 
 void CCActiveAnimation::pushPropertiesTo(CCActiveAnimation* other) const
 {
     // Currently, we only push changes due to pausing and resuming animations on the main thread.
     if (m_runState == CCActiveAnimation::Paused || other->m_runState == CCActiveAnimation::Paused) {
         other->m_runState = m_runState;
         other->m_pauseTime = m_pauseTime;
         other->m_totalPausedTime = m_totalPausedTime;
     }
 }
 
 } // namespace WebCore