Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (291147 => 291148)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2022-03-11 07:26:25 UTC (rev 291147)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2022-03-11 07:37:50 UTC (rev 291148)
@@ -1,5 +1,16 @@
2022-03-10 Antoine Quint <grao...@webkit.org>
+ [web-animations] mask-origin should support discrete animation
+ https://bugs.webkit.org/show_bug.cgi?id=237733
+
+ Reviewed by Antti Koivisto.
+
+ * web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002-expected.txt:
+ * web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002-expected.txt:
+ * web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt:
+
+2022-03-10 Antoine Quint <grao...@webkit.org>
+
[web-animations] font-variant-numeric should support discrete animation
https://bugs.webkit.org/show_bug.cgi?id=237669
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002-expected.txt (291147 => 291148)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002-expected.txt 2022-03-11 07:26:25 UTC (rev 291147)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-002-expected.txt 2022-03-11 07:37:50 UTC (rev 291148)
@@ -40,6 +40,9 @@
PASS mask-image (type: discrete) has testAccumulation function
PASS mask-image: "url("http://localhost/test-2")" onto "url("http://localhost/test-1")"
PASS mask-image: "url("http://localhost/test-1")" onto "url("http://localhost/test-2")"
+PASS mask-origin (type: discrete) has testAccumulation function
+PASS mask-origin: "border-box" onto "content-box"
+PASS mask-origin: "content-box" onto "border-box"
PASS mix-blend-mode (type: discrete) has testAccumulation function
PASS mix-blend-mode: "screen" onto "multiply"
PASS mix-blend-mode: "multiply" onto "screen"
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002-expected.txt (291147 => 291148)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002-expected.txt 2022-03-11 07:26:25 UTC (rev 291147)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-002-expected.txt 2022-03-11 07:37:50 UTC (rev 291148)
@@ -40,6 +40,9 @@
PASS mask-image (type: discrete) has testAddition function
PASS mask-image: "url("http://localhost/test-2")" onto "url("http://localhost/test-1")"
PASS mask-image: "url("http://localhost/test-1")" onto "url("http://localhost/test-2")"
+PASS mask-origin (type: discrete) has testAddition function
+PASS mask-origin: "border-box" onto "content-box"
+PASS mask-origin: "content-box" onto "border-box"
PASS mix-blend-mode (type: discrete) has testAddition function
PASS mix-blend-mode: "screen" onto "multiply"
PASS mix-blend-mode: "multiply" onto "screen"
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt (291147 => 291148)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt 2022-03-11 07:26:25 UTC (rev 291147)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-002-expected.txt 2022-03-11 07:37:50 UTC (rev 291148)
@@ -50,6 +50,10 @@
FAIL mask-image uses discrete animation when animating between "url("http://localhost/test-1")" and "url("http://localhost/test-2")" with linear easing assert_equals: The value should be url("http://localhost/test-1") at 499ms expected "url(\"http://localhost/test-1\")" but got "url(\"http://localhost/test-2\")"
FAIL mask-image uses discrete animation when animating between "url("http://localhost/test-1")" and "url("http://localhost/test-2")" with effect easing assert_equals: The value should be url("http://localhost/test-1") at 940ms expected "url(\"http://localhost/test-1\")" but got "url(\"http://localhost/test-2\")"
FAIL mask-image uses discrete animation when animating between "url("http://localhost/test-1")" and "url("http://localhost/test-2")" with keyframe easing assert_equals: The value should be url("http://localhost/test-1") at 940ms expected "url(\"http://localhost/test-1\")" but got "url(\"http://localhost/test-2\")"
+PASS mask-origin (type: discrete) has testInterpolation function
+PASS mask-origin uses discrete animation when animating between "content-box" and "border-box" with linear easing
+PASS mask-origin uses discrete animation when animating between "content-box" and "border-box" with effect easing
+PASS mask-origin uses discrete animation when animating between "content-box" and "border-box" with keyframe easing
PASS mix-blend-mode (type: discrete) has testInterpolation function
PASS mix-blend-mode uses discrete animation when animating between "multiply" and "screen" with linear easing
PASS mix-blend-mode uses discrete animation when animating between "multiply" and "screen" with effect easing
Modified: trunk/Source/WebCore/ChangeLog (291147 => 291148)
--- trunk/Source/WebCore/ChangeLog 2022-03-11 07:26:25 UTC (rev 291147)
+++ trunk/Source/WebCore/ChangeLog 2022-03-11 07:37:50 UTC (rev 291148)
@@ -1,5 +1,15 @@
2022-03-10 Antoine Quint <grao...@webkit.org>
+ [web-animations] mask-origin should support discrete animation
+ https://bugs.webkit.org/show_bug.cgi?id=237733
+
+ Reviewed by Antti Koivisto.
+
+ * animation/CSSPropertyAnimation.cpp:
+ (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+
+2022-03-10 Antoine Quint <grao...@webkit.org>
+
[web-animations] font-variant-numeric should support discrete animation
https://bugs.webkit.org/show_bug.cgi?id=237669
Modified: trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp (291147 => 291148)
--- trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp 2022-03-11 07:26:25 UTC (rev 291147)
+++ trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp 2022-03-11 07:37:50 UTC (rev 291148)
@@ -1969,6 +1969,9 @@
case CSSPropertyMaskClip:
m_fillLayerPropertyWrapper = makeUnique<FillLayerFillBoxPropertyWrapper>(property, &FillLayer::clip, &FillLayer::setClip);
break;
+ case CSSPropertyMaskOrigin:
+ m_fillLayerPropertyWrapper = makeUnique<FillLayerFillBoxPropertyWrapper>(property, &FillLayer::origin, &FillLayer::setOrigin);
+ break;
default:
break;
}
@@ -2937,6 +2940,7 @@
new FillLayersPropertyWrapper(CSSPropertyWebkitBackgroundSize, &RenderStyle::backgroundLayers, &RenderStyle::ensureBackgroundLayers),
new FillLayersPropertyWrapper(CSSPropertyMaskClip, &RenderStyle::maskLayers, &RenderStyle::ensureMaskLayers),
+ new FillLayersPropertyWrapper(CSSPropertyMaskOrigin, &RenderStyle::maskLayers, &RenderStyle::ensureMaskLayers),
new FillLayersPropertyWrapper(CSSPropertyWebkitMaskPositionX, &RenderStyle::maskLayers, &RenderStyle::ensureMaskLayers),
new FillLayersPropertyWrapper(CSSPropertyWebkitMaskPositionY, &RenderStyle::maskLayers, &RenderStyle::ensureMaskLayers),
new FillLayersPropertyWrapper(CSSPropertyMaskSize, &RenderStyle::maskLayers, &RenderStyle::ensureMaskLayers),
