Changeset 290123 in webkit

Timestamp:

Feb 18, 2022 7:38:23 AM (5 months ago)

Author:

graouts@webkit.org

Message:

[frame-rate] allow setting frameRate as an option passed to Element.animate()
​https://bugs.webkit.org/show_bug.cgi?id=236830

Reviewed by Dean Jackson.

Source/WebCore:

• animation/KeyframeAnimationOptions.h:
• animation/KeyframeAnimationOptions.idl:
• dom/Element.cpp:

(WebCore::Element::animate):

LayoutTests:

• webanimations/frame-rate/animation-frame-rate-expected.txt:
• webanimations/frame-rate/animation-frame-rate.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webanimations/frame-rate/animation-frame-rate-expected.txt (modified) (1 diff)
• LayoutTests/webanimations/frame-rate/animation-frame-rate.html (modified) (4 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/animation/KeyframeAnimationOptions.h (modified) (2 diffs)
• Source/WebCore/animation/KeyframeAnimationOptions.idl (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-02-18  Antoine Quint  <graouts@webkit.org>
+
+        [frame-rate] allow setting frameRate as an option passed to Element.animate()
+        https://bugs.webkit.org/show_bug.cgi?id=236830
+
+        Reviewed by Dean Jackson.
+
+        * webanimations/frame-rate/animation-frame-rate-expected.txt:
+        * webanimations/frame-rate/animation-frame-rate.html:
+
 2022-02-18  Antoine Quint  <graouts@webkit.org>
 

trunk/LayoutTests/webanimations/frame-rate/animation-frame-rate-expected.txt

@@ -2 +2 @@
 PASS Valid animation.frameRate values
 PASS Invalid animation.frameRate values
+PASS Calling element.animate() allows setting animation.frameRate
 

trunk/LayoutTests/webanimations/frame-rate/animation-frame-rate.html

@@ -9 +9 @@
 'use strict';
 
+const presets = ["low", "high", "highest", "auto"];
+const invalidValues = ["default", "120", null, [], {}];
+
 test(t => {
     const animation = new Animation;
@@ -15 +18 @@
 
     // AnimationFrameRatePreset values.
-    for (let value of ["low", "high", "highest", "auto"]) {
+    for (let value of presets) {
         animation.frameRate = value;
         assert_equals(animation.frameRate, value, `The value "${value}" can be set`);
@@ -27 +30 @@
 test(t => {
     const animation = new Animation;
-    for (let value of ["default", "120", null, undefined, [], {}]) {
+    for (let value of invalidValues.concat(undefined)) {
         assert_throws_js(TypeError, () => animation.frameRate = value, `Setting the value ${value} throws`);
         assert_equals(animation.frameRate, "auto", `Setting the invalid value "${value}" does not change the value`);
@@ -33 +36 @@
 }, "Invalid animation.frameRate values");
 
+test(t => {
+    const target = document.createElement("div");
+    const animation = frameRate => target.animate(null, { frameRate });
+
+    // Numeric value.
+    assert_equals(animation(30).frameRate, 30, "frameRate can be set to a numeric value");
+
+    // Presets.
+    for (let value of presets)
+        assert_equals(animation(value).frameRate, value, "frameRate can be set to a preset value");
+
+    // Invalid values.
+    for (let value of invalidValues)
+        assert_throws_js(TypeError, () => animation(value), `providing the invalid value "${value}" throws`);
+}, "Calling element.animate() allows setting animation.frameRate");
+
 </script>
 </body>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-18  Antoine Quint  <graouts@webkit.org>
+
+        [frame-rate] allow setting frameRate as an option passed to Element.animate()
+        https://bugs.webkit.org/show_bug.cgi?id=236830
+
+        Reviewed by Dean Jackson.
+
+        * animation/KeyframeAnimationOptions.h:
+        * animation/KeyframeAnimationOptions.idl:
+        * dom/Element.cpp:
+        (WebCore::Element::animate):
+
 2022-02-18  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/animation/KeyframeAnimationOptions.h

@@ -26 +26 @@
 #pragma once
 
+#include "AnimationFrameRate.h"
+#include "AnimationFrameRatePreset.h"
 #include "KeyframeEffectOptions.h"
 
@@ -32 +34 @@
 struct KeyframeAnimationOptions : KeyframeEffectOptions {
     String id;
+    std::variant<FramesPerSecond, AnimationFrameRatePreset> frameRate;
 };
 

trunk/Source/WebCore/animation/KeyframeAnimationOptions.idl

@@ -24 +24 @@
  */
 
+typedef unsigned long FramesPerSecond;
+
 dictionary KeyframeAnimationOptions : KeyframeEffectOptions {
     DOMString id = "";
+    [EnabledBySetting=WebAnimationsCustomFrameRateEnabled] (FramesPerSecond or AnimationFrameRatePreset) frameRate = "auto";
 };

trunk/Source/WebCore/dom/Element.cpp

@@ -4687 +4687 @@
 {
     String id = "";
+    std::variant<FramesPerSecond, AnimationFrameRatePreset> frameRate = AnimationFrameRatePreset::Auto;
     std::optional<std::variant<double, KeyframeEffectOptions>> keyframeEffectOptions;
     if (options) {
@@ -4696 +4697 @@
             auto keyframeEffectOptions = std::get<KeyframeAnimationOptions>(optionsValue);
             id = keyframeEffectOptions.id;
+            frameRate = keyframeEffectOptions.frameRate;
             keyframeEffectOptionsVariant = WTFMove(keyframeEffectOptions);
         }
@@ -4707 +4709 @@
     auto animation = WebAnimation::create(document(), &keyframeEffectResult.returnValue().get());
     animation->setId(id);
+    animation->setBindingsFrameRate(WTFMove(frameRate));
 
     auto animationPlayResult = animation->play();