Make AnimationEffectReadOnly.getComputedTiming() consistent with Web Animations spec

third_party/WebKit/Source/core/animation/AnimationEffectTest.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 103 matching lines @@
     mutable double m_localTime;
     mutable double m_timeToNextIteration;
 };
 
 TEST(AnimationAnimationEffectTest, Sanity)
 {
     Timing timing;
     timing.iterationDuration = 2;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
-    EXPECT_EQ(0, animationNode->computedTiming().startTime());
-
     animationNode->updateInheritedTime(0);
 
     EXPECT_EQ(AnimationEffect::PhaseActive, animationNode->getPhase());
     EXPECT_TRUE(animationNode->isInPlay());
     EXPECT_TRUE(animationNode->isCurrent());
     EXPECT_TRUE(animationNode->isInEffect());
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->computedTiming().startTime());
     EXPECT_EQ(2, animationNode->activeDurationInternal());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 
     animationNode->updateInheritedTime(1);
 
     EXPECT_EQ(AnimationEffect::PhaseActive, animationNode->getPhase());
     EXPECT_TRUE(animationNode->isInPlay());
     EXPECT_TRUE(animationNode->isCurrent());
     EXPECT_TRUE(animationNode->isInEffect());
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->computedTiming().startTime());
     EXPECT_EQ(2, animationNode->activeDurationInternal());
-    EXPECT_EQ(0.5, animationNode->timeFraction());
+    EXPECT_EQ(0.5, animationNode->progress());
 
     animationNode->updateInheritedTime(2);
 
     EXPECT_EQ(AnimationEffect::PhaseAfter, animationNode->getPhase());
     EXPECT_FALSE(animationNode->isInPlay());
     EXPECT_FALSE(animationNode->isCurrent());
     EXPECT_TRUE(animationNode->isInEffect());
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->computedTiming().startTime());
     EXPECT_EQ(2, animationNode->activeDurationInternal());
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 
     animationNode->updateInheritedTime(3);
 
     EXPECT_EQ(AnimationEffect::PhaseAfter, animationNode->getPhase());
     EXPECT_FALSE(animationNode->isInPlay());
     EXPECT_FALSE(animationNode->isCurrent());
     EXPECT_TRUE(animationNode->isInEffect());
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->computedTiming().startTime());
     EXPECT_EQ(2, animationNode->activeDurationInternal());
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, FillAuto)
 {
     Timing timing;
     timing.iterationDuration = 1;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(-1);
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 
     animationNode->updateInheritedTime(2);
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, FillForwards)
 {
     Timing timing;
     timing.iterationDuration = 1;
     timing.fillMode = Timing::FillModeForwards;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(-1);
-    EXPECT_TRUE(isNull(animationNode->timeFraction()));
+    EXPECT_TRUE(isNull(animationNode->progress()));
 
     animationNode->updateInheritedTime(2);
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, FillBackwards)
 {
     Timing timing;
     timing.iterationDuration = 1;
     timing.fillMode = Timing::FillModeBackwards;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(-1);
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 
     animationNode->updateInheritedTime(2);
-    EXPECT_TRUE(isNull(animationNode->timeFraction()));
+    EXPECT_TRUE(isNull(animationNode->progress()));
 }
 
 TEST(AnimationAnimationEffectTest, FillBoth)
 {
     Timing timing;
     timing.iterationDuration = 1;
     timing.fillMode = Timing::FillModeBoth;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(-1);
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 
     animationNode->updateInheritedTime(2);
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, StartDelay)
 {
     Timing timing;
     timing.iterationDuration = 1;
     timing.fillMode = Timing::FillModeForwards;
     timing.startDelay = 0.5;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(0);
-    EXPECT_TRUE(isNull(animationNode->timeFraction()));
+    EXPECT_TRUE(isNull(animationNode->progress()));
 
     animationNode->updateInheritedTime(0.5);
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 
     animationNode->updateInheritedTime(1.5);
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, ZeroIteration)
 {
     Timing timing;
     timing.iterationDuration = 1;
     timing.fillMode = Timing::FillModeForwards;
     timing.iterationCount = 0;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(-1);
     EXPECT_EQ(0, animationNode->activeDurationInternal());
     EXPECT_TRUE(isNull(animationNode->currentIteration()));
-    EXPECT_TRUE(isNull(animationNode->timeFraction()));
+    EXPECT_TRUE(isNull(animationNode->progress()));
 
     animationNode->updateInheritedTime(0);
     EXPECT_EQ(0, animationNode->activeDurationInternal());
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, InfiniteIteration)
 {
     Timing timing;
     timing.iterationDuration = 1;
     timing.fillMode = Timing::FillModeForwards;
     timing.iterationCount = std::numeric_limits<double>::infinity();
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(-1);
     EXPECT_TRUE(isNull(animationNode->currentIteration()));
-    EXPECT_TRUE(isNull(animationNode->timeFraction()));
+    EXPECT_TRUE(isNull(animationNode->progress()));
 
     EXPECT_EQ(std::numeric_limits<double>::infinity(), animationNode->activeDurationInternal());
 
     animationNode->updateInheritedTime(0);
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, Iteration)
 {
     Timing timing;
     timing.iterationCount = 2;
     timing.iterationDuration = 2;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(0);
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 
     animationNode->updateInheritedTime(1);
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0.5, animationNode->timeFraction());
+    EXPECT_EQ(0.5, animationNode->progress());
 
     animationNode->updateInheritedTime(2);
     EXPECT_EQ(1, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 
     animationNode->updateInheritedTime(2);
     EXPECT_EQ(1, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 
     animationNode->updateInheritedTime(5);
     EXPECT_EQ(1, animationNode->currentIteration());
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, IterationStart)
 {
     Timing timing;
     timing.iterationStart = 1.2;
     timing.iterationCount = 2.2;
     timing.iterationDuration = 1;
     timing.fillMode = Timing::FillModeBoth;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(-1);
     EXPECT_EQ(1, animationNode->currentIteration());
-    EXPECT_NEAR(0.2, animationNode->timeFraction(), 0.000000000000001);
+    EXPECT_NEAR(0.2, animationNode->progress(), 0.000000000000001);
 
     animationNode->updateInheritedTime(0);
     EXPECT_EQ(1, animationNode->currentIteration());
-    EXPECT_NEAR(0.2, animationNode->timeFraction(), 0.000000000000001);
+    EXPECT_NEAR(0.2, animationNode->progress(), 0.000000000000001);
 
     animationNode->updateInheritedTime(10);
     EXPECT_EQ(3, animationNode->currentIteration());
-    EXPECT_NEAR(0.4, animationNode->timeFraction(), 0.000000000000001);
+    EXPECT_NEAR(0.4, animationNode->progress(), 0.000000000000001);
 }
 
 TEST(AnimationAnimationEffectTest, IterationAlternate)
 {
     Timing timing;
     timing.iterationCount = 10;
     timing.iterationDuration = 1;
     timing.direction = Timing::PlaybackDirectionAlternate;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(0.75);
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0.75, animationNode->timeFraction());
+    EXPECT_EQ(0.75, animationNode->progress());
 
     animationNode->updateInheritedTime(1.75);
     EXPECT_EQ(1, animationNode->currentIteration());
-    EXPECT_EQ(0.25, animationNode->timeFraction());
+    EXPECT_EQ(0.25, animationNode->progress());
 
     animationNode->updateInheritedTime(2.75);
     EXPECT_EQ(2, animationNode->currentIteration());
-    EXPECT_EQ(0.75, animationNode->timeFraction());
+    EXPECT_EQ(0.75, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, IterationAlternateReverse)
 {
     Timing timing;
     timing.iterationCount = 10;
     timing.iterationDuration = 1;
     timing.direction = Timing::PlaybackDirectionAlternateReverse;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(0.75);
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0.25, animationNode->timeFraction());
+    EXPECT_EQ(0.25, animationNode->progress());
 
     animationNode->updateInheritedTime(1.75);
     EXPECT_EQ(1, animationNode->currentIteration());
-    EXPECT_EQ(0.75, animationNode->timeFraction());
+    EXPECT_EQ(0.75, animationNode->progress());
 
     animationNode->updateInheritedTime(2.75);
     EXPECT_EQ(2, animationNode->currentIteration());
-    EXPECT_EQ(0.25, animationNode->timeFraction());
+    EXPECT_EQ(0.25, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, ZeroDurationSanity)
 {
     Timing timing;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
-    EXPECT_EQ(0, animationNode->computedTiming().startTime());
-
     animationNode->updateInheritedTime(0);
 
     EXPECT_EQ(AnimationEffect::PhaseAfter, animationNode->getPhase());
     EXPECT_FALSE(animationNode->isInPlay());
     EXPECT_FALSE(animationNode->isCurrent());
     EXPECT_TRUE(animationNode->isInEffect());
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->computedTiming().startTime());
     EXPECT_EQ(0, animationNode->activeDurationInternal());
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 
     animationNode->updateInheritedTime(1);
 
     EXPECT_EQ(AnimationEffect::PhaseAfter, animationNode->getPhase());
     EXPECT_FALSE(animationNode->isInPlay());
     EXPECT_FALSE(animationNode->isCurrent());
     EXPECT_TRUE(animationNode->isInEffect());
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->computedTiming().startTime());
     EXPECT_EQ(0, animationNode->activeDurationInternal());
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, ZeroDurationFillForwards)
 {
     Timing timing;
     timing.fillMode = Timing::FillModeForwards;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(-1);
-    EXPECT_TRUE(isNull(animationNode->timeFraction()));
+    EXPECT_TRUE(isNull(animationNode->progress()));
 
     animationNode->updateInheritedTime(0);
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 
     animationNode->updateInheritedTime(1);
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, ZeroDurationFillBackwards)
 {
     Timing timing;
     timing.fillMode = Timing::FillModeBackwards;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(-1);
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 
     animationNode->updateInheritedTime(0);
-    EXPECT_TRUE(isNull(animationNode->timeFraction()));
+    EXPECT_TRUE(isNull(animationNode->progress()));
 
     animationNode->updateInheritedTime(1);
-    EXPECT_TRUE(isNull(animationNode->timeFraction()));
+    EXPECT_TRUE(isNull(animationNode->progress()));
 }
 
 TEST(AnimationAnimationEffectTest, ZeroDurationFillBoth)
 {
     Timing timing;
     timing.fillMode = Timing::FillModeBoth;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(-1);
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 
     animationNode->updateInheritedTime(0);
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 
     animationNode->updateInheritedTime(1);
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, ZeroDurationStartDelay)
 {
     Timing timing;
     timing.fillMode = Timing::FillModeForwards;
     timing.startDelay = 0.5;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(0);
-    EXPECT_TRUE(isNull(animationNode->timeFraction()));
+    EXPECT_TRUE(isNull(animationNode->progress()));
 
     animationNode->updateInheritedTime(0.5);
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 
     animationNode->updateInheritedTime(1.5);
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, ZeroDurationIterationStartAndCount)
 {
     Timing timing;
     timing.iterationStart = 0.1;
     timing.iterationCount = 0.2;
     timing.fillMode = Timing::FillModeBoth;
     timing.startDelay = 0.3;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(0);
-    EXPECT_EQ(0.1, animationNode->timeFraction());
+    EXPECT_EQ(0.1, animationNode->progress());
 
     animationNode->updateInheritedTime(0.3);
-    EXPECT_DOUBLE_EQ(0.3, animationNode->timeFraction());
+    EXPECT_DOUBLE_EQ(0.3, animationNode->progress());
 
     animationNode->updateInheritedTime(1);
-    EXPECT_DOUBLE_EQ(0.3, animationNode->timeFraction());
+    EXPECT_DOUBLE_EQ(0.3, animationNode->progress());
 }
 
 // FIXME: Needs specification work.
 TEST(AnimationAnimationEffectTest, ZeroDurationInfiniteIteration)
 {
     Timing timing;
     timing.fillMode = Timing::FillModeForwards;
     timing.iterationCount = std::numeric_limits<double>::infinity();
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(-1);
     EXPECT_EQ(0, animationNode->activeDurationInternal());
     EXPECT_TRUE(isNull(animationNode->currentIteration()));
-    EXPECT_TRUE(isNull(animationNode->timeFraction()));
+    EXPECT_TRUE(isNull(animationNode->progress()));
 
     animationNode->updateInheritedTime(0);
     EXPECT_EQ(0, animationNode->activeDurationInternal());
     EXPECT_EQ(std::numeric_limits<double>::infinity(), animationNode->currentIteration());
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, ZeroDurationIteration)
 {
     Timing timing;
     timing.fillMode = Timing::FillModeForwards;
     timing.iterationCount = 2;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(-1);
     EXPECT_TRUE(isNull(animationNode->currentIteration()));
-    EXPECT_TRUE(isNull(animationNode->timeFraction()));
+    EXPECT_TRUE(isNull(animationNode->progress()));
 
     animationNode->updateInheritedTime(0);
     EXPECT_EQ(1, animationNode->currentIteration());
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 
     animationNode->updateInheritedTime(1);
     EXPECT_EQ(1, animationNode->currentIteration());
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, ZeroDurationIterationStart)
 {
     Timing timing;
     timing.iterationStart = 1.2;
     timing.iterationCount = 2.2;
     timing.fillMode = Timing::FillModeBoth;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(-1);
     EXPECT_EQ(1, animationNode->currentIteration());
-    EXPECT_NEAR(0.2, animationNode->timeFraction(), 0.000000000000001);
+    EXPECT_NEAR(0.2, animationNode->progress(), 0.000000000000001);
 
     animationNode->updateInheritedTime(0);
     EXPECT_EQ(3, animationNode->currentIteration());
-    EXPECT_NEAR(0.4, animationNode->timeFraction(), 0.000000000000001);
+    EXPECT_NEAR(0.4, animationNode->progress(), 0.000000000000001);
 
     animationNode->updateInheritedTime(10);
     EXPECT_EQ(3, animationNode->currentIteration());
-    EXPECT_NEAR(0.4, animationNode->timeFraction(), 0.000000000000001);
+    EXPECT_NEAR(0.4, animationNode->progress(), 0.000000000000001);
 }
 
 TEST(AnimationAnimationEffectTest, ZeroDurationIterationAlternate)
 {
     Timing timing;
     timing.fillMode = Timing::FillModeForwards;
     timing.iterationCount = 2;
     timing.direction = Timing::PlaybackDirectionAlternate;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(-1);
     EXPECT_TRUE(isNull(animationNode->currentIteration()));
-    EXPECT_TRUE(isNull(animationNode->timeFraction()));
+    EXPECT_TRUE(isNull(animationNode->progress()));
 
     animationNode->updateInheritedTime(0);
     EXPECT_EQ(1, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 
     animationNode->updateInheritedTime(1);
     EXPECT_EQ(1, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, ZeroDurationIterationAlternateReverse)
 {
     Timing timing;
     timing.fillMode = Timing::FillModeForwards;
     timing.iterationCount = 2;
     timing.direction = Timing::PlaybackDirectionAlternateReverse;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
     animationNode->updateInheritedTime(-1);
     EXPECT_TRUE(isNull(animationNode->currentIteration()));
-    EXPECT_TRUE(isNull(animationNode->timeFraction()));
+    EXPECT_TRUE(isNull(animationNode->progress()));
 
     animationNode->updateInheritedTime(0);
     EXPECT_EQ(1, animationNode->currentIteration());
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 
     animationNode->updateInheritedTime(1);
     EXPECT_EQ(1, animationNode->currentIteration());
-    EXPECT_EQ(1, animationNode->timeFraction());
+    EXPECT_EQ(1, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, InfiniteDurationSanity)
 {
     Timing timing;
     timing.iterationDuration = std::numeric_limits<double>::infinity();
     timing.iterationCount = 1;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
-    EXPECT_EQ(0, animationNode->computedTiming().startTime());
-
     animationNode->updateInheritedTime(0);
 
     EXPECT_EQ(std::numeric_limits<double>::infinity(), animationNode->activeDurationInternal());
     EXPECT_EQ(AnimationEffect::PhaseActive, animationNode->getPhase());
     EXPECT_TRUE(animationNode->isInPlay());
     EXPECT_TRUE(animationNode->isCurrent());
     EXPECT_TRUE(animationNode->isInEffect());
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 
     animationNode->updateInheritedTime(1);
 
     EXPECT_EQ(std::numeric_limits<double>::infinity(), animationNode->activeDurationInternal());
     EXPECT_EQ(AnimationEffect::PhaseActive, animationNode->getPhase());
     EXPECT_TRUE(animationNode->isInPlay());
     EXPECT_TRUE(animationNode->isCurrent());
     EXPECT_TRUE(animationNode->isInEffect());
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 }
 
 // FIXME: Needs specification work.
 TEST(AnimationAnimationEffectTest, InfiniteDurationZeroIterations)
 {
     Timing timing;
     timing.iterationDuration = std::numeric_limits<double>::infinity();
     timing.iterationCount = 0;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
-    EXPECT_EQ(0, animationNode->computedTiming().startTime());
-
     animationNode->updateInheritedTime(0);
 
     EXPECT_EQ(0, animationNode->activeDurationInternal());
     EXPECT_EQ(AnimationEffect::PhaseAfter, animationNode->getPhase());
     EXPECT_FALSE(animationNode->isInPlay());
     EXPECT_FALSE(animationNode->isCurrent());
     EXPECT_TRUE(animationNode->isInEffect());
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 
     animationNode->updateInheritedTime(1);
 
     EXPECT_EQ(AnimationEffect::PhaseAfter, animationNode->getPhase());
     EXPECT_EQ(AnimationEffect::PhaseAfter, animationNode->getPhase());
     EXPECT_FALSE(animationNode->isInPlay());
     EXPECT_FALSE(animationNode->isCurrent());
     EXPECT_TRUE(animationNode->isInEffect());
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, InfiniteDurationInfiniteIterations)
 {
     Timing timing;
     timing.iterationDuration = std::numeric_limits<double>::infinity();
     timing.iterationCount = std::numeric_limits<double>::infinity();
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
-    EXPECT_EQ(0, animationNode->computedTiming().startTime());
-
     animationNode->updateInheritedTime(0);
 
     EXPECT_EQ(std::numeric_limits<double>::infinity(), animationNode->activeDurationInternal());
     EXPECT_EQ(AnimationEffect::PhaseActive, animationNode->getPhase());
     EXPECT_TRUE(animationNode->isInPlay());
     EXPECT_TRUE(animationNode->isCurrent());
     EXPECT_TRUE(animationNode->isInEffect());
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 
     animationNode->updateInheritedTime(1);
 
     EXPECT_EQ(std::numeric_limits<double>::infinity(), animationNode->activeDurationInternal());
     EXPECT_EQ(AnimationEffect::PhaseActive, animationNode->getPhase());
     EXPECT_TRUE(animationNode->isInPlay());
     EXPECT_TRUE(animationNode->isCurrent());
     EXPECT_TRUE(animationNode->isInEffect());
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, InfiniteDurationZeroPlaybackRate)
 {
     Timing timing;
     timing.iterationDuration = std::numeric_limits<double>::infinity();
     timing.playbackRate = 0;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
 
-    EXPECT_EQ(0, animationNode->computedTiming().startTime());
-
     animationNode->updateInheritedTime(0);
 
     EXPECT_EQ(std::numeric_limits<double>::infinity(), animationNode->activeDurationInternal());
     EXPECT_EQ(AnimationEffect::PhaseActive, animationNode->getPhase());
     EXPECT_TRUE(animationNode->isInPlay());
     EXPECT_TRUE(animationNode->isCurrent());
     EXPECT_TRUE(animationNode->isInEffect());
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 
     animationNode->updateInheritedTime(std::numeric_limits<double>::infinity());
 
     EXPECT_EQ(std::numeric_limits<double>::infinity(), animationNode->activeDurationInternal());
     EXPECT_EQ(AnimationEffect::PhaseAfter, animationNode->getPhase());
     EXPECT_FALSE(animationNode->isInPlay());
     EXPECT_FALSE(animationNode->isCurrent());
     EXPECT_TRUE(animationNode->isInEffect());
     EXPECT_EQ(0, animationNode->currentIteration());
-    EXPECT_EQ(0, animationNode->timeFraction());
+    EXPECT_EQ(0, animationNode->progress());
 }
 
 TEST(AnimationAnimationEffectTest, EndTime)
 {
     Timing timing;
     timing.startDelay = 1;
     timing.endDelay = 2;
     timing.iterationDuration = 4;
     timing.iterationCount = 2;
     TestAnimationEffect* animationNode = TestAnimationEffect::create(timing);
@@ skipping 55 matching lines @@
     EXPECT_TRUE(std::isinf(animationNode->takeTimeToNextIteration()));
 
     // Item has finished.
     animationNode->updateInheritedTime(3.5);
     EXPECT_EQ(AnimationEffect::PhaseAfter, animationNode->getPhase());
     EXPECT_EQ(3.5, animationNode->takeLocalTime());
     EXPECT_TRUE(std::isinf(animationNode->takeTimeToNextIteration()));
 }
 
 } // namespace blink