Changeset 224128 in webkit

Timestamp:

Oct 27, 2017 1:29:59 PM (7 years ago)

Author:

graouts@webkit.org

Message:

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

Reviewed by Dean Jackson.

Source/WebCore:

We add the currentTime property on AnimationTimeline and add an internals method
to set it in a test which will allow us to validate the timing model state for
a given time.

Test: webanimations/timeline-current-time.html

• animation/AnimationTimeline.cpp:

(WebCore::AnimationTimeline::bindingsCurrentTime const):
(WebCore::AnimationTimeline::setCurrentTime):

• animation/AnimationTimeline.h:

(WebCore::AnimationTimeline::currentTime const):

• animation/AnimationTimeline.idl:
• testing/Internals.cpp:

(WebCore::Internals::setTimelineCurrentTime):

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

Add a new test that checks we can read the document's timeline currentTime
property and set it via the internals method.

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-10-27  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] Expose the currentTime property on AnimationTimeline
+        https://bugs.webkit.org/show_bug.cgi?id=178928
+
+        Reviewed by Dean Jackson.
+
+        Add a new test that checks we can read the document's timeline currentTime
+        property and set it via the internals method.
+
+        * webanimations/timeline-current-time-expected.txt: Added.
+        * webanimations/timeline-current-time.html: Added.
+
 2017-10-27  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-27  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] Expose the currentTime property on AnimationTimeline
+        https://bugs.webkit.org/show_bug.cgi?id=178928
+
+        Reviewed by Dean Jackson.
+
+        We add the currentTime property on AnimationTimeline and add an internals method
+        to set it in a test which will allow us to validate the timing model state for
+        a given time.
+
+        Test: webanimations/timeline-current-time.html
+
+        * animation/AnimationTimeline.cpp:
+        (WebCore::AnimationTimeline::bindingsCurrentTime const):
+        (WebCore::AnimationTimeline::setCurrentTime):
+        * animation/AnimationTimeline.h:
+        (WebCore::AnimationTimeline::currentTime const):
+        * animation/AnimationTimeline.idl:
+        * testing/Internals.cpp:
+        (WebCore::Internals::setTimelineCurrentTime):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2017-10-27  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/animation/AnimationTimeline.cpp

@@ -53 +53 @@
 }
 
+std::optional<double> AnimationTimeline::bindingsCurrentTime() const
+{
+    if (!m_currentTime)
+        return std::nullopt;
+    return m_currentTime->value();
+}
+
+void AnimationTimeline::setCurrentTime(Seconds currentTime)
+{
+    m_currentTime = currentTime;
+}
+
 String AnimationTimeline::description()
 {

trunk/Source/WebCore/animation/AnimationTimeline.h

@@ -30 +30 @@
 #include <wtf/Forward.h>
 #include <wtf/HashSet.h>
+#include <wtf/Optional.h>
 #include <wtf/Ref.h>
 #include <wtf/RefCounted.h>
+#include <wtf/Seconds.h>
 
 namespace WebCore {
@@ -42 +44 @@
     void addAnimation(Ref<WebAnimation>&&);
     void removeAnimation(Ref<WebAnimation>&&);
+    std::optional<double> bindingsCurrentTime() const;
+    std::optional<Seconds> currentTime() const { return m_currentTime; }
+    WEBCORE_EXPORT void setCurrentTime(Seconds);
     WEBCORE_EXPORT String description();
 
@@ -57 +62 @@
 private:
     ClassType m_classType;
+    std::optional<Seconds> m_currentTime;
     HashSet<RefPtr<WebAnimation>> m_animations;
 };

trunk/Source/WebCore/animation/AnimationTimeline.idl

@@ -29 +29 @@
     CustomToJSObject
 ] interface AnimationTimeline {
+    [ImplementedAs=bindingsCurrentTime] readonly attribute double? currentTime;
 };

trunk/Source/WebCore/testing/Internals.cpp

@@ -4262 +4262 @@
 }
 
+void Internals::setTimelineCurrentTime(AnimationTimeline& timeline, double currentTime)
+{
+    timeline.setCurrentTime(Seconds(currentTime));
+}
+
 #if ENABLE(APPLE_PAY)
 MockPaymentCoordinator& Internals::mockPaymentCoordinator() const

trunk/Source/WebCore/testing/Internals.h

@@ -626 +626 @@
 
     String timelineDescription(AnimationTimeline&);
+    void setTimelineCurrentTime(AnimationTimeline&, double);
 
 private:

trunk/Source/WebCore/testing/Internals.idl

@@ -564 +564 @@
 
     [EnabledAtRuntime=WebAnimations] DOMString timelineDescription(AnimationTimeline timeline);
+    [EnabledAtRuntime=WebAnimations] void setTimelineCurrentTime(AnimationTimeline timeline, double currentTime);
     [Conditional=APPLE_PAY] readonly attribute MockPaymentCoordinator mockPaymentCoordinator;
 };