Changeset 224163 in webkit

Timestamp:

Oct 29, 2017 1:22:34 PM (6 years ago)

Author:

graouts@webkit.org

Message:

[Web Animations] Expose the currentTime property on Animation
​https://bugs.webkit.org/show_bug.cgi?id=178988

Reviewed by Dean Jackson.

Source/WebCore:

We now expose the currentTime property on Animation objects, our first
step in implementing the Web Animations timing model, specifically section
3.5.4. "The current time of an animation" and section 3.5.5. "Setting the
current time of an animation". Setting the startTime has implications on
currentTime and vice-versa.

Test: webanimations/animation-current-time.html

• animation/WebAnimation.cpp:

(WebCore::WebAnimation::setBindingsStartTime):
(WebCore::WebAnimation::startTime const):
(WebCore::WebAnimation::setStartTime):
(WebCore::WebAnimation::bindingsCurrentTime const):
(WebCore::WebAnimation::setBindingsCurrentTime):
(WebCore::WebAnimation::currentTime const):
(WebCore::WebAnimation::setCurrentTime):

• animation/WebAnimation.h:
• animation/WebAnimation.idl:

LayoutTests:

Add a new test that checks that the currentTime property is set
correctly based on the startTime value and the document timeline
currentTime, and that setting the property may raise an exception
and otherwise update the animation startTime.

• webanimations/animation-current-time-expected.txt: Added.
• webanimations/animation-current-time.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webanimations/animation-current-time-expected.txt (added)
• LayoutTests/webanimations/animation-current-time.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/WebAnimation.cpp (modified) (1 diff)
• Source/WebCore/animation/WebAnimation.h (modified) (3 diffs)
• Source/WebCore/animation/WebAnimation.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-10-29  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] Expose the currentTime property on Animation
+        https://bugs.webkit.org/show_bug.cgi?id=178988
+
+        Reviewed by Dean Jackson.
+
+        Add a new test that checks that the currentTime property is set
+        correctly based on the startTime value and the document timeline
+        currentTime, and that setting the property may raise an exception
+        and otherwise update the animation startTime.
+
+        * webanimations/animation-current-time-expected.txt: Added.
+        * webanimations/animation-current-time.html: Added.
+
 2017-10-28  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-29  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] Expose the currentTime property on Animation
+        https://bugs.webkit.org/show_bug.cgi?id=178988
+
+        Reviewed by Dean Jackson.
+
+        We now expose the currentTime property on Animation objects, our first
+        step in implementing the Web Animations timing model, specifically section
+        3.5.4. "The current time of an animation" and section 3.5.5. "Setting the
+        current time of an animation". Setting the startTime has implications on
+        currentTime and vice-versa.
+
+        Test: webanimations/animation-current-time.html
+
+        * animation/WebAnimation.cpp:
+        (WebCore::WebAnimation::setBindingsStartTime):
+        (WebCore::WebAnimation::startTime const):
+        (WebCore::WebAnimation::setStartTime):
+        (WebCore::WebAnimation::bindingsCurrentTime const):
+        (WebCore::WebAnimation::setBindingsCurrentTime):
+        (WebCore::WebAnimation::currentTime const):
+        (WebCore::WebAnimation::setCurrentTime):
+        * animation/WebAnimation.h:
+        * animation/WebAnimation.idl:
+
 2017-10-29  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/animation/WebAnimation.cpp

@@ -69 +69 @@
 {
     if (startTime == std::nullopt)
-        m_startTime = std::nullopt;
+        setStartTime(std::nullopt);
     else
-        m_startTime = Seconds(startTime.value());
+        setStartTime(Seconds(startTime.value()));
+}
+
+std::optional<Seconds> WebAnimation::startTime() const
+{
+    return m_startTime;
+}
+
+void WebAnimation::setStartTime(std::optional<Seconds> startTime)
+{
+    if (startTime == m_startTime)
+        return;
+
+    m_startTime = startTime;
+}
+
+std::optional<double> WebAnimation::bindingsCurrentTime() const
+{
+    auto time = currentTime();
+    if (!time)
+        return std::nullopt;
+    return time->value();
+}
+
+ExceptionOr<void> WebAnimation::setBindingsCurrentTime(std::optional<double> currentTime)
+{
+    if (!currentTime)
+        return Exception { TypeError };
+    setCurrentTime(Seconds(currentTime.value()));
+    return { };
+}
+
+std::optional<Seconds> WebAnimation::currentTime() const
+{
+    // FIXME: return the hold time when we support pausing (webkit.org/b/178932).
+
+    if (!m_timeline || !m_startTime)
+        return std::nullopt;
+
+    auto timelineTime = m_timeline->currentTime();
+    if (!timelineTime)
+        return std::nullopt;
+
+    // FIXME: account for playback rate when we support it (webkit.org/b/178931).
+    return timelineTime.value() - m_startTime.value();
+}
+
+void WebAnimation::setCurrentTime(std::optional<Seconds> seekTime)
+{
+    // FIXME: account for hold time when we support it (webkit.org/b/178932).
+
+    if (!m_timeline) {
+        setStartTime(std::nullopt);
+        return;
+    }
+
+    std::optional<Seconds> timelineTime = m_timeline->currentTime();
+    if (timelineTime == std::nullopt) {
+        setStartTime(std::nullopt);
+        return;
+    }
+
+    // FIXME: account for playback rate when we support it (webkit.org/b/178931).
+    setStartTime(timelineTime.value() - seekTime.value());
 }
 

trunk/Source/WebCore/animation/WebAnimation.h

@@ -26 +26 @@
 #pragma once
 
+#include "ExceptionOr.h"
 #include <wtf/Forward.h>
 #include <wtf/Optional.h>
@@ -46 +47 @@
     void setEffect(RefPtr<AnimationEffect>&&);
     AnimationTimeline* timeline() const { return m_timeline.get(); }
+
     std::optional<double> bindingsStartTime() const;
     void setBindingsStartTime(std::optional<double>);
-    std::optional<Seconds> startTime() const { return m_startTime; }
-    void setStartTime(Seconds startTime) { m_startTime = startTime; }
+    std::optional<Seconds> startTime() const;
+    void setStartTime(std::optional<Seconds>);
+
+    std::optional<double> bindingsCurrentTime() const;
+    ExceptionOr<void> setBindingsCurrentTime(std::optional<double>);
+    std::optional<Seconds> currentTime() const;
+    void setCurrentTime(std::optional<Seconds>);
 
     String description();
@@ -55 +62 @@
 private:
     WebAnimation(AnimationTimeline*);
+
     RefPtr<AnimationEffect> m_effect;
     RefPtr<AnimationTimeline> m_timeline;

trunk/Source/WebCore/animation/WebAnimation.idl

@@ -33 +33 @@
     readonly attribute AnimationTimeline? timeline;
     [ImplementedAs=bindingsStartTime] attribute double? startTime;
+    [MayThrowException, ImplementedAs=bindingsCurrentTime] attribute double? currentTime;
 };