Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (291042 => 291043)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2022-03-09 12:58:38 UTC (rev 291042)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2022-03-09 13:01:55 UTC (rev 291043)
@@ -1,3 +1,14 @@
+2022-03-09 Antoine Quint <[email protected]>
+
+ [web-animations] color-interpolation-filters should support discrete animation
+ https://bugs.webkit.org/show_bug.cgi?id=237637
+
+ Reviewed by Antti Koivisto.
+
+ * web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt:
+ * web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt:
+ * web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt:
+
2022-03-08 Antoine Quint <[email protected]>
[web-animations] clip-rule should support discrete animations
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt (291042 => 291043)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt 2022-03-09 12:58:38 UTC (rev 291042)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt 2022-03-09 13:01:55 UTC (rev 291043)
@@ -139,6 +139,9 @@
PASS color-interpolation (type: discrete) has testAccumulation function
PASS color-interpolation: "auto" onto "linearrgb"
PASS color-interpolation: "linearrgb" onto "auto"
+PASS color-interpolation-filters (type: discrete) has testAccumulation function
+PASS color-interpolation-filters: "linearrgb" onto "srgb"
+PASS color-interpolation-filters: "srgb" onto "linearrgb"
PASS column-count (type: positiveInteger) has testAccumulation function
PASS column-count: positive integer
PASS column-count (type: discrete) has testAccumulation function
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt (291042 => 291043)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt 2022-03-09 12:58:38 UTC (rev 291042)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt 2022-03-09 13:01:55 UTC (rev 291043)
@@ -139,6 +139,9 @@
PASS color-interpolation (type: discrete) has testAddition function
PASS color-interpolation: "auto" onto "linearrgb"
PASS color-interpolation: "linearrgb" onto "auto"
+PASS color-interpolation-filters (type: discrete) has testAddition function
+PASS color-interpolation-filters: "linearrgb" onto "srgb"
+PASS color-interpolation-filters: "srgb" onto "linearrgb"
PASS column-count (type: positiveInteger) has testAddition function
PASS column-count: positive integer
PASS column-count (type: discrete) has testAddition function
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt (291042 => 291043)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt 2022-03-09 12:58:38 UTC (rev 291042)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt 2022-03-09 13:01:55 UTC (rev 291043)
@@ -169,6 +169,10 @@
PASS color-interpolation uses discrete animation when animating between "linearrgb" and "auto" with linear easing
PASS color-interpolation uses discrete animation when animating between "linearrgb" and "auto" with effect easing
PASS color-interpolation uses discrete animation when animating between "linearrgb" and "auto" with keyframe easing
+PASS color-interpolation-filters (type: discrete) has testInterpolation function
+PASS color-interpolation-filters uses discrete animation when animating between "srgb" and "linearrgb" with linear easing
+PASS color-interpolation-filters uses discrete animation when animating between "srgb" and "linearrgb" with effect easing
+PASS color-interpolation-filters uses discrete animation when animating between "srgb" and "linearrgb" with keyframe easing
PASS column-count (type: positiveInteger) has testInterpolation function
PASS column-count supports animating as a positive integer
PASS column-count (type: discrete) has testInterpolation function
Modified: trunk/Source/WebCore/ChangeLog (291042 => 291043)
--- trunk/Source/WebCore/ChangeLog 2022-03-09 12:58:38 UTC (rev 291042)
+++ trunk/Source/WebCore/ChangeLog 2022-03-09 13:01:55 UTC (rev 291043)
@@ -1,3 +1,16 @@
+2022-03-09 Antoine Quint <[email protected]>
+
+ [web-animations] color-interpolation-filters should support discrete animation
+ https://bugs.webkit.org/show_bug.cgi?id=237637
+
+ Reviewed by Antti Koivisto.
+
+ * animation/CSSPropertyAnimation.cpp:
+ (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyle::colorInterpolationFilters const):
+ (WebCore::RenderStyle::setColorInterpolationFilters):
+
2022-03-08 Antoine Quint <[email protected]>
[web-animations] clip-rule should support discrete animations
Modified: trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp (291042 => 291043)
--- trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp 2022-03-09 12:58:38 UTC (rev 291042)
+++ trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp 2022-03-09 13:01:55 UTC (rev 291043)
@@ -2842,7 +2842,8 @@
new DiscretePropertyWrapper<Kerning>(CSSPropertyFontKerning, &RenderStyle::fontKerning, &RenderStyle::setFontKerning),
new DiscretePropertyWrapper<FontFeatureSettings>(CSSPropertyFontFeatureSettings, &RenderStyle::fontFeatureSettings, &RenderStyle::setFontFeatureSettings),
new FontFamilyWrapper,
- new DiscretePropertyWrapper<WindRule>(CSSPropertyClipRule, &RenderStyle::clipRule, &RenderStyle::setClipRule)
+ new DiscretePropertyWrapper<WindRule>(CSSPropertyClipRule, &RenderStyle::clipRule, &RenderStyle::setClipRule),
+ new DiscretePropertyWrapper<ColorInterpolation>(CSSPropertyColorInterpolationFilters, &RenderStyle::colorInterpolationFilters, &RenderStyle::setColorInterpolationFilters)
};
const unsigned animatableLonghandPropertiesCount = WTF_ARRAY_LENGTH(animatableLonghandPropertyWrappers);
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (291042 => 291043)
--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2022-03-09 12:58:38 UTC (rev 291042)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2022-03-09 13:01:55 UTC (rev 291043)
@@ -1434,6 +1434,8 @@
void setClipRule(WindRule clipRule) { accessSVGStyle().setClipRule(clipRule); }
ColorInterpolation colorInterpolation() const { return svgStyle().colorInterpolation(); }
void setColorInterpolation(ColorInterpolation colorInterpolation) { accessSVGStyle().setColorInterpolation(colorInterpolation); }
+ ColorInterpolation colorInterpolationFilters() const { return svgStyle().colorInterpolationFilters(); }
+ void setColorInterpolationFilters(ColorInterpolation colorInterpolationFilters) { accessSVGStyle().setColorInterpolationFilters(colorInterpolationFilters); }
SVGPaintType fillPaintType() const { return svgStyle().fillPaintType(); }
Color fillPaintColor() const { return svgStyle().fillPaintColor(); }
