Plumb timeToNextEffect through players and animation

Source/core/animation/PlayerTest.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/Player.h"
 
+#include "core/animation/Animation.h"
 #include "core/animation/DocumentTimeline.h"
 #include "core/dom/Document.h"
 #include "core/dom/QualifiedName.h"
 #include "weborigin/KURL.h"
 #include <gtest/gtest.h>
 
 using namespace WebCore;
 
 namespace {
 
 class CoreAnimationPlayerTest : public ::testing::Test {
 protected:
     virtual void SetUp()
     {
         document = Document::create();
         timeline = DocumentTimeline::create(document.get());
         player = Player::create(timeline.get(), 0);
         timeline->setZeroTimeAsPerfTime(0);
     }
 
-    bool updateTimeline(double time)
+    bool updateTimeline(double time, double* timeToEffectChange = 0)
     {
         timeline->serviceAnimations(time);
         // The timeline does not know about our player, so we have to explicitly call update().
-        return player->update();
+        return player->update(timeToEffectChange);
     }
 
     RefPtr<Document> document;
     RefPtr<DocumentTimeline> timeline;
     RefPtr<Player> player;
 };
 
 TEST_F(CoreAnimationPlayerTest, InitialState)
 {
     EXPECT_EQ(0, timeline->currentTime());
@@ skipping 182 matching lines @@
     updateTimeline(0);
     player->setCurrentTime(std::numeric_limits<double>::max());
     EXPECT_EQ(std::numeric_limits<double>::max(), player->currentTime());
     EXPECT_EQ(-std::numeric_limits<double>::max(), player->timeDrift());
 
     updateTimeline(100);
     EXPECT_EQ(std::numeric_limits<double>::max(), player->currentTime());
     EXPECT_EQ(-std::numeric_limits<double>::max(), player->timeDrift());
 }
 
+TEST_F(CoreAnimationPlayerTest, EmptyPlayersDontUpdateEffects)
+{
+    double timeToNextEffect;
+    updateTimeline(0, &timeToNextEffect);
+    EXPECT_EQ(std::numeric_limits<double>::infinity(), timeToNextEffect);
+
+    timeToNextEffect = 0;
+    updateTimeline(1234, &timeToNextEffect);
+    EXPECT_EQ(std::numeric_limits<double>::infinity(), timeToNextEffect);
 }
+
+TEST_F(CoreAnimationPlayerTest, PlayersReturnTimeToNextEffect)
+{
+    Timing timing;
+    timing.startDelay = 1;
+    timing.iterationDuration = 1;
+    timing.hasIterationDuration = true;
+    RefPtr<Animation> animation = Animation::create(0, 0, timing);
+    player = Player::create(timeline.get(), animation.get());
+
+    double timeToNextEffect;
+    updateTimeline(0, &timeToNextEffect);
+    EXPECT_EQ(1, timeToNextEffect);
+
+    updateTimeline(0.5, &timeToNextEffect);
+    EXPECT_EQ(0.5, timeToNextEffect);
+
+    updateTimeline(1, &timeToNextEffect);
+    EXPECT_EQ(0, timeToNextEffect);
+
+    updateTimeline(1.5, &timeToNextEffect);
+    EXPECT_EQ(0, timeToNextEffect);
+
+    updateTimeline(2, &timeToNextEffect);
+    EXPECT_EQ(std::numeric_limits<double>::infinity(), timeToNextEffect);
+
+    updateTimeline(3, &timeToNextEffect);
+    EXPECT_EQ(std::numeric_limits<double>::infinity(), timeToNextEffect);
+}
+
+}