From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../animation/registered-neutral-keyframe.html     | 29 +++++++++++++
 .../registered-var-to-registered-animating.html    | 50 ++++++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 testing/web-platform/tests/css/css-properties-values-api/animation/registered-neutral-keyframe.html
 create mode 100644 testing/web-platform/tests/css/css-properties-values-api/animation/registered-var-to-registered-animating.html

(limited to 'testing/web-platform/tests/css/css-properties-values-api/animation')
diff --git a/testing/web-platform/tests/css/css-properties-values-api/animation/registered-neutral-keyframe.html b/testing/web-platform/tests/css/css-properties-values-api/animation/registered-neutral-keyframe.html
new file mode 100644
index 0000000000..ac3ad0c2c2
--- /dev/null
+++ b/testing/web-platform/tests/css/css-properties-values-api/animation/registered-neutral-keyframe.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+@keyframes test {
+  to { --x: to; }
+}
+#target {
+  --x: underlying;
+  animation: test 1s;
+}
+</style>
+<div id="target"></div>
+<script>
+CSS.registerProperty({
+  name: '--x',
+  syntax: '*',
+  inherits: false,
+});
+
+test(() => {
+  target.style.animationDelay = '-0.25s';
+  assert_equals(getComputedStyle(target).getPropertyValue('--x'), 'underlying', 'at 25%');
+
+  target.style.animationDelay = '-0.75s';
+  assert_equals(getComputedStyle(target).getPropertyValue('--x'), 'to', 'at 25%');
+}, 'CSS Animations neutral keyframes on registered custom properties should produce the underlying value');
+</script>
diff --git a/testing/web-platform/tests/css/css-properties-values-api/animation/registered-var-to-registered-animating.html b/testing/web-platform/tests/css/css-properties-values-api/animation/registered-var-to-registered-animating.html
new file mode 100644
index 0000000000..477e30b47b
--- /dev/null
+++ b/testing/web-platform/tests/css/css-properties-values-api/animation/registered-var-to-registered-animating.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.css-houdini.org/css-properties-values-api-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+#target {
+  --static: 100;
+}
+</style>
+<div id="target"></div>
+<script>
+setup(() => {
+  for (let name of ['--test', '--static', '--animated']) {
+    CSS.registerProperty({
+      name,
+      syntax: '<number>',
+      initialValue: '0',
+      inherits: false,
+    });
+  }
+});
+
+test(() => {
+  // --test is animating from a static value to an animated value resulting in it changing quadratically.
+  let animation = target.animate({'--test': ['var(--static)', 'var(--animated)']}, 100);
+  let referencedAnimation = target.animate({'--animated': ['200', '300']}, 100);
+
+  referencedAnimation.currentTime = 25;
+  {
+    animation.currentTime = 25;
+    // lerp(100, lerp(200, 300, 25%), 25%) == 0.75*100 + 0.25*(0.75*200 + 0.25*300) == 131.25
+    assert_equals(getComputedStyle(target).getPropertyValue('--test'), '131.25', 'target at 25%, to at 25%');
+
+    animation.currentTime = 75;
+    // lerp(100, lerp(200, 300, 25%), 75%) == 0.25*100 + 0.75*(0.75*200 + 0.25*300) == 193.75
+    assert_equals(getComputedStyle(target).getPropertyValue('--test'), '193.75', 'target at 75%, to at 25%');
+  }
+
+  referencedAnimation.currentTime = 75;
+  {
+    animation.currentTime = 25;
+    // lerp(100, lerp(200, 300, 75%), 25%) == 0.75*100 + 0.25*(0.25*200 + 0.75*300) == 143.75
+    assert_equals(getComputedStyle(target).getPropertyValue('--test'), '143.75', 'target at 25%, to at 25%');
+
+    animation.currentTime = 75;
+    // lerp(100, lerp(200, 300, 75%), 75%) == 0.25*100 + 0.75*(0.25*200 + 0.75*300) == 231.25
+    assert_equals(getComputedStyle(target).getPropertyValue('--test'), '231.25', 'target at 75%, to at 25%');
+  }
+}, 'Animated registered custom properties can var() reference other animated registered custom properties across separate Animations.');
+</script>
-- 
cgit v1.2.3

