Web Animations: Use null for unresolved startTime and currentTime in AnimationPlayer

BUG=396372 Review URL: https://codereview.chromium.org/556453004 git-svn-id: svn://svn.chromium.org/blink/trunk@181704 bbb929c8-8fbe-4397-9dbb-9b2b20218538

Web Animations: Use null for unresolved startTime and currentTime in AnimationPlayer
BUG=396372 Review URL: https://codereview.chromium.org/556453004 git-svn-id: svn://svn.chromium.org/blink/trunk@181704 bbb929c8-8fbe-4397-9dbb-9b2b20218538
5c4015cd · dstockwell@chromium.org · 0b67de13 · 5c4015cd · 5c4015cd · 5c4015cd
Commit 5c4015cd authored Sep 10, 2014 by dstockwell@chromium.org
4 changed files
--- a/third_party/WebKit/LayoutTests/web-animations-api/player-unresolved-times.html
+++ b/third_party/WebKit/LayoutTests/web-animations-api/player-unresolved-times.html
+<!DOCTYPE html>
+<script src="../resources/testharness.js"></script>
+<script src="../resources/testharnessreport.js"></script>
+
+<script>
+function assert_unresolved(value) {
+  assert_equals(value, null);
+}
+
+test(function() {
+  var player = document.documentElement.animate([], 100000);
+  player.cancel();
+  assert_unresolved(player.startTime);
+  assert_unresolved(player.currentTime);
+}, "unresolved startTime and currentTime");
+
+</script>
--- a/third_party/WebKit/Source/core/animation/AnimationPlayer.cpp
+++ b/third_party/WebKit/Source/core/animation/AnimationPlayer.cpp
@@ -147,11 +147,25 @@ void AnimationPlayer::updateCurrentTimingState(TimingUpdateReason reason)
    m_holdTime = m_playbackRate < 0 ? 0 : sourceEnd();
 }

+double AnimationPlayer::startTime(bool& isNull) const
+{
+    double result = startTime();
+    isNull = std::isnan(result);
+    return result;
+}
+
 double AnimationPlayer::startTime() const
 {
    return m_startTime * 1000;
 }

+double AnimationPlayer::currentTime(bool& isNull)
+{
+    double result = currentTime();
+    isNull = std::isnan(result);
+    return result;
+}
+
 double AnimationPlayer::currentTime()
 {
    if (m_currentTimePending || m_idle)

--- a/third_party/WebKit/Source/core/animation/AnimationPlayer.h
+++ b/third_party/WebKit/Source/core/animation/AnimationPlayer.h
@@ -70,6 +70,7 @@ public:

    void cancel();

+    double currentTime(bool& isNull);
    double currentTime();
    void setCurrentTime(double newCurrentTime);

@@ -110,6 +111,7 @@ public:

    double calculateStartTime(double currentTime) const;
    bool hasStartTime() const { return !isNull(m_startTime); }
+    double startTime(bool& isNull) const;
    double startTime() const;
    double startTimeInternal() const { return m_startTime; }
    void setStartTime(double);

--- a/third_party/WebKit/Source/core/animation/AnimationPlayer.idl
+++ b/third_party/WebKit/Source/core/animation/AnimationPlayer.idl
@@ -36,8 +36,8 @@ enum AnimationPlayState { "idle", "pending", "running", "paused", "finished" };
    ActiveDOMObject,
 ] interface AnimationPlayer : EventTarget {
    [RuntimeEnabled=WebAnimationsAPI]                      attribute AnimationNode? source;
-    [RuntimeEnabled=WebAnimationsPlaybackControl]          attribute double     startTime;
-    [RuntimeEnabled=WebAnimationsPlaybackControl]          attribute double     currentTime;
+    [RuntimeEnabled=WebAnimationsPlaybackControl]          attribute double?    startTime;
+    [RuntimeEnabled=WebAnimationsPlaybackControl]          attribute double?    currentTime;
    [RuntimeEnabled=WebAnimationsPlaybackControl]          attribute double     playbackRate;
    [RuntimeEnabled=WebAnimationsPlaybackControl] readonly attribute AnimationPlayState playState;
    [RuntimeEnabled=WebAnimationsPlaybackControl, RaisesException] void finish();