diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs index 6decaf26011..ec2247e1896 100644 --- a/components/layout/display_list/builder.rs +++ b/components/layout/display_list/builder.rs @@ -62,7 +62,7 @@ use crate::display_list::items::{ PushTextShadowDisplayItem, StackingContext, StackingContextType, StickyFrameData, TextOrientation, WebRenderImageInfo, }; -use crate::display_list::{border, gradient, ToLayout}; +use crate::display_list::{border, gradient, FilterToLayout, ToLayout}; use crate::flow::{BaseFlow, Flow, FlowFlags}; use crate::flow_ref::FlowRef; use crate::fragment::{ @@ -1975,8 +1975,14 @@ impl Fragment { .translate(-border_box_offset.to_vector()); // Create the filter pipeline. + let current_color = self.style().clone_color(); let effects = self.style().get_effects(); - let mut filters: Vec = effects.filter.0.iter().map(ToLayout::to_layout).collect(); + let mut filters: Vec = effects + .filter + .0 + .iter() + .map(|filter| FilterToLayout::to_layout(filter, ¤t_color)) + .collect(); if effects.opacity != 1.0 { filters.push(FilterOp::Opacity(effects.opacity.into(), effects.opacity)); } diff --git a/components/layout/display_list/conversions.rs b/components/layout/display_list/conversions.rs index d081f40a10f..112e6c00d6b 100644 --- a/components/layout/display_list/conversions.rs +++ b/components/layout/display_list/conversions.rs @@ -17,6 +17,11 @@ pub trait ToLayout { fn to_layout(&self) -> Self::Type; } +pub trait FilterToLayout { + type Type; + fn to_layout(&self, current_color: &RGBA) -> Self::Type; +} + impl ToLayout for BorderStyle { type Type = wr::BorderStyle; fn to_layout(&self) -> Self::Type { @@ -35,9 +40,9 @@ impl ToLayout for BorderStyle { } } -impl ToLayout for Filter { +impl FilterToLayout for Filter { type Type = wr::FilterOp; - fn to_layout(&self) -> Self::Type { + fn to_layout(&self, current_color: &RGBA) -> Self::Type { match *self { Filter::Blur(radius) => wr::FilterOp::Blur(radius.px(), radius.px()), Filter::Brightness(amount) => wr::FilterOp::Brightness(amount.0), @@ -48,8 +53,14 @@ impl ToLayout for Filter { Filter::Opacity(amount) => wr::FilterOp::Opacity(amount.0.into(), amount.0), Filter::Saturate(amount) => wr::FilterOp::Saturate(amount.0), Filter::Sepia(amount) => wr::FilterOp::Sepia(amount.0), - // Statically check that DropShadow is impossible. - Filter::DropShadow(ref shadow) => match *shadow {}, + Filter::DropShadow(ref shadow) => wr::FilterOp::DropShadow(wr::Shadow { + blur_radius: shadow.blur.px(), + offset: wr::units::LayoutVector2D::new( + shadow.horizontal.px(), + shadow.vertical.px(), + ), + color: shadow.color.clone().into_rgba(*current_color).to_layout(), + }), // Statically check that Url is impossible. Filter::Url(ref url) => match *url {}, } diff --git a/components/layout/display_list/mod.rs b/components/layout/display_list/mod.rs index 57fffef5469..aa6d3d2f500 100644 --- a/components/layout/display_list/mod.rs +++ b/components/layout/display_list/mod.rs @@ -6,7 +6,7 @@ pub use self::builder::{ BorderPaintingMode, DisplayListBuildState, IndexableText, StackingContextCollectionFlags, StackingContextCollectionState, }; -pub use self::conversions::ToLayout; +pub use self::conversions::{FilterToLayout, ToLayout}; mod background; mod border; diff --git a/components/layout_2020/display_list/conversions.rs b/components/layout_2020/display_list/conversions.rs index b0022c99cdf..b543d3580fc 100644 --- a/components/layout_2020/display_list/conversions.rs +++ b/components/layout_2020/display_list/conversions.rs @@ -6,7 +6,8 @@ use style::computed_values::mix_blend_mode::T as ComputedMixBlendMode; use style::computed_values::text_decoration_style::T as ComputedTextDecorationStyle; use style::computed_values::transform_style::T as ComputedTransformStyle; use style::values::computed::{Filter as ComputedFilter, Length}; -use webrender_api::{units, FilterOp, LineStyle, MixBlendMode, TransformStyle}; +use style::values::RGBA; +use webrender_api::{units, FilterOp, LineStyle, MixBlendMode, Shadow, TransformStyle}; use crate::geom::{PhysicalPoint, PhysicalRect, PhysicalSides, PhysicalSize}; @@ -15,9 +16,14 @@ pub trait ToWebRender { fn to_webrender(&self) -> Self::Type; } -impl ToWebRender for ComputedFilter { +pub trait FilterToWebRender { + type Type; + fn to_webrender(&self, current_color: &RGBA) -> Self::Type; +} + +impl FilterToWebRender for ComputedFilter { type Type = FilterOp; - fn to_webrender(&self) -> Self::Type { + fn to_webrender(&self, current_color: &RGBA) -> Self::Type { match *self { ComputedFilter::Blur(radius) => FilterOp::Blur(radius.px(), radius.px()), ComputedFilter::Brightness(amount) => FilterOp::Brightness(amount.0), @@ -28,13 +34,17 @@ impl ToWebRender for ComputedFilter { ComputedFilter::Opacity(amount) => FilterOp::Opacity(amount.0.into(), amount.0), ComputedFilter::Saturate(amount) => FilterOp::Saturate(amount.0), ComputedFilter::Sepia(amount) => FilterOp::Sepia(amount.0), - // Statically check that DropShadow is impossible. - ComputedFilter::DropShadow(ref shadow) => match *shadow {}, + ComputedFilter::DropShadow(ref shadow) => FilterOp::DropShadow(Shadow { + blur_radius: shadow.blur.px(), + offset: units::LayoutVector2D::new(shadow.horizontal.px(), shadow.vertical.px()), + color: super::rgba(shadow.color.clone().into_rgba(*current_color)), + }), // Statically check that Url is impossible. ComputedFilter::Url(ref url) => match *url {}, } } } + impl ToWebRender for ComputedMixBlendMode { type Type = MixBlendMode; fn to_webrender(&self) -> Self::Type { diff --git a/components/layout_2020/display_list/stacking_context.rs b/components/layout_2020/display_list/stacking_context.rs index f69e8f6e946..e38d5894705 100644 --- a/components/layout_2020/display_list/stacking_context.rs +++ b/components/layout_2020/display_list/stacking_context.rs @@ -23,7 +23,7 @@ use webrender_api::ScrollSensitivity; use super::DisplayList; use crate::cell::ArcRefCell; -use crate::display_list::conversions::ToWebRender; +use crate::display_list::conversions::{FilterToWebRender, ToWebRender}; use crate::display_list::DisplayListBuilder; use crate::fragment_tree::{ AnonymousFragment, BoxFragment, ContainingBlockManager, Fragment, FragmentTree, @@ -341,11 +341,12 @@ impl StackingContext { } // Create the filter pipeline. + let current_color = style.clone_color(); let mut filters: Vec = effects .filter .0 .iter() - .map(ToWebRender::to_webrender) + .map(|filter| FilterToWebRender::to_webrender(filter, ¤t_color)) .collect(); if effects.opacity != 1.0 { filters.push(wr::FilterOp::Opacity( diff --git a/components/style/properties/helpers/animated_properties.mako.rs b/components/style/properties/helpers/animated_properties.mako.rs index b62ddb25ce4..72848a1a402 100644 --- a/components/style/properties/helpers/animated_properties.mako.rs +++ b/components/style/properties/helpers/animated_properties.mako.rs @@ -749,7 +749,7 @@ impl Animate for AnimatedFilter { ) -> Result { use crate::values::animated::animate_multiplicative_factor; match (self, other) { - % for func in ['Blur', 'Grayscale', 'HueRotate', 'Invert', 'Sepia']: + % for func in ['Blur', 'DropShadow', 'Grayscale', 'HueRotate', 'Invert', 'Sepia']: (&Filter::${func}(ref this), &Filter::${func}(ref other)) => { Ok(Filter::${func}(this.animate(other, procedure)?)) }, @@ -759,11 +759,6 @@ impl Animate for AnimatedFilter { Ok(Filter::${func}(animate_multiplicative_factor(this, other, procedure)?)) }, % endfor - % if engine == "gecko": - (&Filter::DropShadow(ref this), &Filter::DropShadow(ref other)) => { - Ok(Filter::DropShadow(this.animate(other, procedure)?)) - }, - % endif _ => Err(()), } } @@ -773,15 +768,12 @@ impl Animate for AnimatedFilter { impl ToAnimatedZero for AnimatedFilter { fn to_animated_zero(&self) -> Result { match *self { - % for func in ['Blur', 'Grayscale', 'HueRotate', 'Invert', 'Sepia']: + % for func in ['Blur', 'DropShadow', 'Grayscale', 'HueRotate', 'Invert', 'Sepia']: Filter::${func}(ref this) => Ok(Filter::${func}(this.to_animated_zero()?)), % endfor % for func in ['Brightness', 'Contrast', 'Opacity', 'Saturate']: Filter::${func}(_) => Ok(Filter::${func}(1.)), % endfor - % if engine == "gecko": - Filter::DropShadow(ref this) => Ok(Filter::DropShadow(this.to_animated_zero()?)), - % endif _ => Err(()), } } diff --git a/components/style/values/animated/effects.rs b/components/style/values/animated/effects.rs index 67557e54b77..e2b37cecbe7 100644 --- a/components/style/values/animated/effects.rs +++ b/components/style/values/animated/effects.rs @@ -24,4 +24,4 @@ pub type AnimatedFilter = /// An animated value for a single `filter`. #[cfg(not(feature = "gecko"))] -pub type AnimatedFilter = GenericFilter; +pub type AnimatedFilter = GenericFilter; diff --git a/components/style/values/computed/effects.rs b/components/style/values/computed/effects.rs index b0a92024cad..ce3498d1410 100644 --- a/components/style/values/computed/effects.rs +++ b/components/style/values/computed/effects.rs @@ -36,7 +36,7 @@ pub type Filter = GenericFilter< NonNegativeNumber, ZeroToOneNumber, NonNegativeLength, - Impossible, + SimpleShadow, Impossible, >; diff --git a/components/style/values/specified/effects.rs b/components/style/values/specified/effects.rs index fd92e6ee95e..70c0f1ceb4d 100644 --- a/components/style/values/specified/effects.rs +++ b/components/style/values/specified/effects.rs @@ -47,7 +47,7 @@ pub type SpecifiedFilter = GenericFilter< NonNegativeFactor, ZeroToOneFactor, NonNegativeLength, - Impossible, + SimpleShadow, Impossible, >; diff --git a/tests/wpt/meta-legacy-layout/css/css-masking/clip/clip-filter-order.html.ini b/tests/wpt/meta-legacy-layout/css/css-masking/clip/clip-filter-order.html.ini new file mode 100644 index 00000000000..7563b8e51fb --- /dev/null +++ b/tests/wpt/meta-legacy-layout/css/css-masking/clip/clip-filter-order.html.ini @@ -0,0 +1,2 @@ +[clip-filter-order.html] + expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/filter-effects/animation/filter-interpolation-002.html.ini b/tests/wpt/meta-legacy-layout/css/filter-effects/animation/filter-interpolation-002.html.ini index c25ecb990ec..502a3bdb92f 100644 --- a/tests/wpt/meta-legacy-layout/css/filter-effects/animation/filter-interpolation-002.html.ini +++ b/tests/wpt/meta-legacy-layout/css/filter-effects/animation/filter-interpolation-002.html.ini @@ -68,24 +68,15 @@ [Web Animations: property from [hue-rotate(180deg)\] to [none\] at (0) should be [hue-rotate(180deg)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (-1) should be [drop-shadow(-20px -10px white)\]] - expected: FAIL - [CSS Animations: property from [grayscale(0) blur(0px)\] to [blur(10px)\] at (0.6) should be [blur(10px)\]] expected: FAIL - [CSS Transitions: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1.5) should be [drop-shadow(30px 15px #004100)\]] - expected: FAIL - [Web Animations: property from [none\] to [hue-rotate(180deg)\] at (0.25) should be [hue-rotate(45deg)\]] expected: FAIL [Web Animations: property from [none\] to [opacity(0.5) hue-rotate(180deg)\] at (0) should be [opacity(1) hue-rotate(0deg)\]] expected: FAIL - [CSS Transitions: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0) should be [drop-shadow(0px 0px 0px currentcolor)\]] - expected: FAIL - [Web Animations: property from [grayscale(0) blur(0px)\] to [blur(10px)\] at (1.5) should be [blur(10px)\]] expected: FAIL @@ -95,15 +86,9 @@ [Web Animations: property from [drop-shadow(20px 10px blue)\] to [drop-shadow(20px 10px green)\] at (2147483648) should be [drop-shadow(20px 10px #00FF00\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1.5) should be [drop-shadow(30px 15px #004100)\]] - expected: FAIL - [Web Animations: property from [hue-rotate(180deg)\] to [none\] at (0.5) should be [hue-rotate(90deg)\]] expected: FAIL - [CSS Transitions: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (-1) should be [drop-shadow(-20px -10px white)\]] - expected: FAIL - [Web Animations: property from [none\] to [hue-rotate(180deg)\] at (1) should be [hue-rotate(180deg)\]] expected: FAIL @@ -116,15 +101,9 @@ [Web Animations: property from [none\] to [opacity(0.5) hue-rotate(180deg)\] at (0.5) should be [opacity(0.75) hue-rotate(90deg)\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0) should be [drop-shadow(0px 0px 0px currentcolor)\]] - expected: FAIL - [Web Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0) should be [drop-shadow(0px 0px 0px currentcolor)\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1.5) should be [drop-shadow(30px 15px #004100)\]] - expected: FAIL - [CSS Animations: property from [grayscale(0) blur(0px)\] to [blur(10px)\] at (1.5) should be [blur(10px)\]] expected: FAIL @@ -149,9 +128,6 @@ [CSS Animations: property from [grayscale(0) blur(0px)\] to [blur(10px)\] at (0) should be [grayscale(0) blur(0px)\]] expected: FAIL - [CSS Transitions: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1) should be [drop-shadow(20px 10px green)\]] - expected: FAIL - [Web Animations: property from [hue-rotate(180deg)\] to [none\] at (1.5) should be [hue-rotate(-90deg)\]] expected: FAIL @@ -170,9 +146,6 @@ [Web Animations: property from [blur(6px)\] to [blur(10px) hue-rotate(180deg)\] at (0.5) should be [blur(8px) hue-rotate(90deg)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0.5) should be [drop-shadow(10px 5px #80C080)\]] - expected: FAIL - [Web Animations: property from [grayscale(0) blur(0px)\] to [blur(10px)\] at (0.6) should be [blur(10px)\]] expected: FAIL @@ -191,9 +164,6 @@ [Web Animations: property from [none\] to [opacity(0.5) hue-rotate(180deg)\] at (1) should be [opacity(0.5) hue-rotate(180deg)\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (-1) should be [drop-shadow(-20px -10px white)\]] - expected: FAIL - [Web Animations: property from [blur(6px)\] to [blur(10px) hue-rotate(180deg)\] at (0) should be [blur(6px) hue-rotate(0deg)\]] expected: FAIL @@ -206,36 +176,21 @@ [CSS Animations: property from [grayscale(0) blur(0px)\] to [blur(10px)\] at (1) should be [blur(10px)\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1) should be [drop-shadow(20px 10px green)\]] - expected: FAIL - [Web Animations: property from [blur(6px)\] to [blur(10px) hue-rotate(180deg)\] at (1.5) should be [blur(12px) hue-rotate(270deg)\]] expected: FAIL [Web Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1) should be [drop-shadow(20px 10px green)\]] expected: FAIL - [CSS Transitions: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0.5) should be [drop-shadow(10px 5px #80C080)\]] - expected: FAIL - [Web Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0.5) should be [drop-shadow(10px 5px #80C080)\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0.5) should be [drop-shadow(10px 5px #80C080)\]] - expected: FAIL - [Web Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1.5) should be [drop-shadow(30px 15px #004100)\]] expected: FAIL [Web Animations: property from [none\] to [hue-rotate(180deg)\] at (1.5) should be [hue-rotate(270deg)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1) should be [drop-shadow(20px 10px green)\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0) should be [drop-shadow(0px 0px 0px currentcolor)\]] - expected: FAIL - [CSS Transitions: property from [grayscale(0) blur(0px)\] to [blur(10px)\] at (-0.3) should be [grayscale(0) blur(0px)\]] expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/filter-effects/animation/filter-interpolation-003.html.ini b/tests/wpt/meta-legacy-layout/css/filter-effects/animation/filter-interpolation-003.html.ini index 81b61549669..0ea3f0970a4 100644 --- a/tests/wpt/meta-legacy-layout/css/filter-effects/animation/filter-interpolation-003.html.ini +++ b/tests/wpt/meta-legacy-layout/css/filter-effects/animation/filter-interpolation-003.html.ini @@ -161,9 +161,6 @@ [CSS Transitions with transition: all: property from [url("#svgfilter")\] to [none\] at (0) should be [none\]] expected: FAIL - [CSS Transitions: property from [none\] to [drop-shadow(20px 10px green)\] at (1) should be [drop-shadow(20px 10px green)\]] - expected: FAIL - [Web Animations: property from [opacity(0)\] to [none\] at (1.5) should be [opacity(1)\]] expected: FAIL @@ -188,9 +185,6 @@ [Web Animations: property from [none\] to [grayscale(1)\] at (-1) should be [grayscale(0)\]] expected: FAIL - [CSS Animations: property from [none\] to [drop-shadow(20px 10px green)\] at (0) should be [drop-shadow(0px 0px 0px transparent)\]] - expected: FAIL - [Web Animations: property from [url("#svgfilter")\] to [blur(5px)\] at (1.5) should be [blur(5px)\]] expected: FAIL @@ -227,9 +221,6 @@ [Web Animations: property from [initial\] to [sepia(1)\] at (0) should be [sepia(0)\]] expected: FAIL - [CSS Transitions: property from [none\] to [drop-shadow(20px 10px green)\] at (1.5) should be [drop-shadow(30px 15px #00C000)\]] - expected: FAIL - [Web Animations: property from [initial\] to [sepia(1)\] at (0.5) should be [sepia(0.5)\]] expected: FAIL @@ -263,27 +254,18 @@ [Web Animations: property from [none\] to [blur(10px)\] at (-1) should be [blur(0px)\]] expected: FAIL - [CSS Transitions with transition: all: property from [none\] to [drop-shadow(20px 10px green)\] at (0) should be [drop-shadow(0px 0px 0px transparent)\]] - expected: FAIL - [Web Animations: property from [none\] to [invert(1)\] at (1) should be [invert(1)\]] expected: FAIL [Web Animations: property from [none\] to [blur(10px)\] at (1) should be [blur(10px)\]] expected: FAIL - [CSS Animations: property from [none\] to [drop-shadow(20px 10px green)\] at (1) should be [drop-shadow(20px 10px green)\]] - expected: FAIL - [CSS Transitions with transition: all: property from [url("#svgfilter")\] to [blur(5px)\] at (-0.3) should be [blur(5px)\]] expected: FAIL [Web Animations: property from [none\] to [grayscale(1)\] at (0) should be [grayscale(0)\]] expected: FAIL - [CSS Transitions with transition: all: property from [none\] to [drop-shadow(20px 10px green)\] at (-1) should be [drop-shadow(-20px -10px transparent)\]] - expected: FAIL - [CSS Animations: property from [url("#svgfilter")\] to [none\] at (0) should be [url("#svgfilter")\]] expected: FAIL @@ -323,12 +305,6 @@ [Web Animations: property from [none\] to [blur(10px)\] at (1.5) should be [blur(15px)\]] expected: FAIL - [CSS Transitions with transition: all: property from [none\] to [drop-shadow(20px 10px green)\] at (0.5) should be [drop-shadow(10px 5px rgba(0, 128, 0, 0.5))\]] - expected: FAIL - - [CSS Animations: property from [none\] to [drop-shadow(20px 10px green)\] at (-1) should be [drop-shadow(-20px -10px transparent)\]] - expected: FAIL - [Web Animations: property from [contrast(0)\] to [none\] at (1) should be [contrast(1)\]] expected: FAIL @@ -368,9 +344,6 @@ [CSS Animations: property from [url("#svgfilter")\] to [blur(5px)\] at (-0.3) should be [url("#svgfilter")\]] expected: FAIL - [CSS Animations: property from [none\] to [drop-shadow(20px 10px green)\] at (1.5) should be [drop-shadow(30px 15px #00C000)\]] - expected: FAIL - [Web Animations: property from [url("#svgfilter")\] to [blur(5px)\] at (0.5) should be [blur(5px)\]] expected: FAIL @@ -404,9 +377,6 @@ [Web Animations: property from [url("#svgfilter")\] to [none\] at (1.5) should be [none\]] expected: FAIL - [CSS Transitions: property from [none\] to [drop-shadow(20px 10px green)\] at (-1) should be [drop-shadow(-20px -10px transparent)\]] - expected: FAIL - [Web Animations: property from [none\] to [invert(1)\] at (-1) should be [invert(0)\]] expected: FAIL @@ -440,12 +410,6 @@ [CSS Transitions with transition: all: property from [url("#svgfilter")\] to [none\] at (0.5) should be [none\]] expected: FAIL - [CSS Animations: property from [none\] to [drop-shadow(20px 10px green)\] at (0.5) should be [drop-shadow(10px 5px rgba(0, 128, 0, 0.5))\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [none\] to [drop-shadow(20px 10px green)\] at (1) should be [drop-shadow(20px 10px green)\]] - expected: FAIL - [Web Animations: property from [none\] to [sepia(1)\] at (0.5) should be [sepia(0.5)\]] expected: FAIL @@ -458,9 +422,6 @@ [Web Animations: property from [none\] to [grayscale(1)\] at (1) should be [grayscale(1)\]] expected: FAIL - [CSS Transitions: property from [none\] to [drop-shadow(20px 10px green)\] at (0) should be [drop-shadow(0px 0px 0px transparent)\]] - expected: FAIL - [Web Animations: property from [url("#svgfilter")\] to [blur(5px)\] at (0.6) should be [blur(5px)\]] expected: FAIL @@ -488,9 +449,6 @@ [CSS Transitions: property from [url("#svgfilter")\] to [blur(5px)\] at (0.3) should be [blur(5px)\]] expected: FAIL - [CSS Transitions: property from [none\] to [drop-shadow(20px 10px green)\] at (0.5) should be [drop-shadow(10px 5px rgba(0, 128, 0, 0.5))\]] - expected: FAIL - [Web Animations: property from [saturate(0)\] to [none\] at (1.5) should be [saturate(1.5)\]] expected: FAIL @@ -509,9 +467,6 @@ [Web Animations: property from [url("#svgfilter")\] to [none\] at (0.6) should be [none\]] expected: FAIL - [CSS Transitions with transition: all: property from [none\] to [drop-shadow(20px 10px green)\] at (1.5) should be [drop-shadow(30px 15px #00C000)\]] - expected: FAIL - [CSS Transitions with transition: all: property from [url("#svgfilter")\] to [none\] at (1) should be [none\]] expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/filter-effects/animation/filter-interpolation-004.html.ini b/tests/wpt/meta-legacy-layout/css/filter-effects/animation/filter-interpolation-004.html.ini index 14b77eaa956..40f49c5ba9c 100644 --- a/tests/wpt/meta-legacy-layout/css/filter-effects/animation/filter-interpolation-004.html.ini +++ b/tests/wpt/meta-legacy-layout/css/filter-effects/animation/filter-interpolation-004.html.ini @@ -161,12 +161,6 @@ [Web Animations: property from [grayscale(0)\] to [grayscale()\] at (0) should be [grayscale(0)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (-1) should be [drop-shadow(-20px -10px blue)\]] - expected: FAIL - - [CSS Transitions: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (0) should be [drop-shadow(0px 0px blue)\]] - expected: FAIL - [Web Animations: property from [blur()\] to [blur(10px)\] at (-1) should be [blur(0px)\]] expected: FAIL @@ -179,21 +173,12 @@ [Web Animations: property from [hue-rotate()\] to [hue-rotate(360deg)\] at (0) should be [hue-rotate()\]] expected: FAIL - [CSS Transitions: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (0.5) should be [drop-shadow(10px 5px 15px rgb(0, 64, 128))\]] - expected: FAIL - [Web Animations: property from [invert(0)\] to [invert()\] at (0) should be [invert(0)\]] expected: FAIL [Web Animations: property from [brightness(0)\] to [brightness()\] at (1) should be [brightness()\]] expected: FAIL - [CSS Transitions: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (1.5) should be [drop-shadow(30px 15px 45px rgb(0, 192, 0))\]] - expected: FAIL - - [CSS Animations: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (0) should be [drop-shadow(0px 0px blue)\]] - expected: FAIL - [Web Animations: property from [contrast(0)\] to [contrast()\] at (1.5) should be [contrast(1.5)\]] expected: FAIL @@ -209,15 +194,9 @@ [Web Animations: property from [brightness(0)\] to [brightness()\] at (1.5) should be [brightness(1.5)\]] expected: FAIL - [CSS Transitions: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (1) should be [drop-shadow(20px 10px 30px green)\]] - expected: FAIL - [Web Animations: property from [invert(0)\] to [invert()\] at (-1) should be [invert(0)\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (1) should be [drop-shadow(20px 10px 30px green)\]] - expected: FAIL - [Web Animations: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (1.5) should be [drop-shadow(30px 15px 45px rgb(0, 192, 0))\]] expected: FAIL @@ -236,9 +215,6 @@ [Web Animations: property from [opacity(0)\] to [opacity()\] at (1) should be [opacity()\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (-1) should be [drop-shadow(-20px -10px blue)\]] - expected: FAIL - [Web Animations: property from [opacity(0)\] to [opacity()\] at (-1) should be [opacity(0)\]] expected: FAIL @@ -251,9 +227,6 @@ [Web Animations: property from [opacity(0)\] to [opacity()\] at (0) should be [opacity(0)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (1.5) should be [drop-shadow(30px 15px 45px rgb(0, 192, 0))\]] - expected: FAIL - [Web Animations: property from [sepia(0)\] to [sepia()\] at (1) should be [sepia()\]] expected: FAIL @@ -266,15 +239,6 @@ [Web Animations: property from [saturate(0)\] to [saturate()\] at (-1) should be [saturate(0)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (0) should be [drop-shadow(0px 0px blue)\]] - expected: FAIL - - [CSS Animations: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (1.5) should be [drop-shadow(30px 15px 45px rgb(0, 192, 0))\]] - expected: FAIL - - [CSS Transitions: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (-1) should be [drop-shadow(-20px -10px blue)\]] - expected: FAIL - [Web Animations: property from [grayscale(0)\] to [grayscale()\] at (1) should be [grayscale()\]] expected: FAIL @@ -314,9 +278,6 @@ [Web Animations: property from [opacity(0)\] to [opacity()\] at (0.5) should be [opacity(0.5)\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (0.5) should be [drop-shadow(10px 5px 15px rgb(0, 64, 128))\]] - expected: FAIL - [Web Animations: property from [contrast(0)\] to [contrast()\] at (0) should be [contrast(0)\]] expected: FAIL @@ -326,18 +287,12 @@ [Web Animations: property from [brightness(0)\] to [brightness()\] at (-1) should be [brightness(0)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (1) should be [drop-shadow(20px 10px 30px green)\]] - expected: FAIL - [Web Animations: property from [contrast(0)\] to [contrast()\] at (-1) should be [contrast(0)\]] expected: FAIL [Web Animations: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (-1) should be [drop-shadow(-20px -10px blue)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (0.5) should be [drop-shadow(10px 5px 15px rgb(0, 64, 128))\]] - expected: FAIL - [Web Animations: property from [blur()\] to [blur(10px)\] at (1.5) should be [blur(15px)\]] expected: FAIL @@ -349,4 +304,3 @@ [Web Animations: property from [contrast(0)\] to [contrast()\] at (1) should be [contrast()\]] expected: FAIL - diff --git a/tests/wpt/meta-legacy-layout/css/filter-effects/filters-drop-shadow-001.html.ini b/tests/wpt/meta-legacy-layout/css/filter-effects/filters-drop-shadow-001.html.ini deleted file mode 100644 index 180e39f034b..00000000000 --- a/tests/wpt/meta-legacy-layout/css/filter-effects/filters-drop-shadow-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[filters-drop-shadow-001.html] - expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/filter-effects/parsing/filter-computed.html.ini b/tests/wpt/meta-legacy-layout/css/filter-effects/parsing/filter-computed.html.ini index ee892e282ec..86dfdf7cd6e 100644 --- a/tests/wpt/meta-legacy-layout/css/filter-effects/parsing/filter-computed.html.ini +++ b/tests/wpt/meta-legacy-layout/css/filter-effects/parsing/filter-computed.html.ini @@ -16,10 +16,3 @@ [Property filter value 'blur(10px) url("https://www.example.com/picture.svg#f") contrast(20) brightness(30)'] expected: FAIL - - [Property filter value 'drop-shadow(1px 2px)'] - expected: FAIL - - [Property filter value 'drop-shadow(rgb(4, 5, 6) 1px 2px 0px)'] - expected: FAIL - diff --git a/tests/wpt/meta-legacy-layout/css/filter-effects/parsing/filter-parsing-valid.html.ini b/tests/wpt/meta-legacy-layout/css/filter-effects/parsing/filter-parsing-valid.html.ini index b8ca47ff7b3..d4cb4601db2 100644 --- a/tests/wpt/meta-legacy-layout/css/filter-effects/parsing/filter-parsing-valid.html.ini +++ b/tests/wpt/meta-legacy-layout/css/filter-effects/parsing/filter-parsing-valid.html.ini @@ -1,25 +1,13 @@ [filter-parsing-valid.html] - [e.style['filter'\] = "drop-shadow(1px 2px)" should set the property value] - expected: FAIL - [Serialization should round-trip after setting e.style['filter'\] = "drop-shadow(1px 2px)"] expected: FAIL - [e.style['filter'\] = "drop-shadow(1px 2px 3px)" should set the property value] - expected: FAIL - [Serialization should round-trip after setting e.style['filter'\] = "drop-shadow(1px 2px 3px)"] expected: FAIL - [e.style['filter'\] = "drop-shadow(0 0 0)" should set the property value] - expected: FAIL - [Serialization should round-trip after setting e.style['filter'\] = "drop-shadow(0 0 0)"] expected: FAIL - [e.style['filter'\] = "drop-shadow(1px 2px rgb(4, 5, 6))" should set the property value] - expected: FAIL - [Serialization should round-trip after setting e.style['filter'\] = "drop-shadow(1px 2px rgb(4, 5, 6))"] expected: FAIL @@ -47,15 +35,8 @@ [Serialization should round-trip after setting e.style['filter'\] = "blur(10px) url(\\"picture.svg#f\\") contrast(20) brightness(30)"] expected: FAIL - [e.style['filter'\] = "drop-shadow(rgb(4, 5, 6) 1px 2px)" should set the property value] - expected: FAIL - [Serialization should round-trip after setting e.style['filter'\] = "drop-shadow(rgb(4, 5, 6) 1px 2px)"] expected: FAIL - [e.style['filter'\] = "drop-shadow(rgba(4, 5, 6, 0.75) 1px 2px 3px)" should set the property value] - expected: FAIL - [Serialization should round-trip after setting e.style['filter'\] = "drop-shadow(rgba(4, 5, 6, 0.75) 1px 2px 3px)"] expected: FAIL - diff --git a/tests/wpt/meta/css/css-masking/clip/clip-filter-order.html.ini b/tests/wpt/meta/css/css-masking/clip/clip-filter-order.html.ini new file mode 100644 index 00000000000..7563b8e51fb --- /dev/null +++ b/tests/wpt/meta/css/css-masking/clip/clip-filter-order.html.ini @@ -0,0 +1,2 @@ +[clip-filter-order.html] + expected: FAIL diff --git a/tests/wpt/meta/css/filter-effects/animation/filter-interpolation-002.html.ini b/tests/wpt/meta/css/filter-effects/animation/filter-interpolation-002.html.ini index ce5331712d8..75e16c5fad6 100644 --- a/tests/wpt/meta/css/filter-effects/animation/filter-interpolation-002.html.ini +++ b/tests/wpt/meta/css/filter-effects/animation/filter-interpolation-002.html.ini @@ -17,21 +17,12 @@ [Web Animations: property from [hue-rotate(180deg)\] to [none\] at (0) should be [hue-rotate(180deg)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (-1) should be [drop-shadow(-20px -10px white)\]] - expected: FAIL - - [CSS Transitions: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1.5) should be [drop-shadow(30px 15px #004100)\]] - expected: FAIL - [Web Animations: property from [none\] to [hue-rotate(180deg)\] at (0.25) should be [hue-rotate(45deg)\]] expected: FAIL [Web Animations: property from [none\] to [opacity(0.5) hue-rotate(180deg)\] at (0) should be [opacity(1) hue-rotate(0deg)\]] expected: FAIL - [CSS Transitions: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0) should be [drop-shadow(0px 0px 0px currentcolor)\]] - expected: FAIL - [Web Animations: property from [grayscale(0) blur(0px)\] to [blur(10px)\] at (1.5) should be [blur(10px)\]] expected: FAIL @@ -41,15 +32,9 @@ [Web Animations: property from [drop-shadow(20px 10px blue)\] to [drop-shadow(20px 10px green)\] at (2147483648) should be [drop-shadow(20px 10px #00FF00\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1.5) should be [drop-shadow(30px 15px #004100)\]] - expected: FAIL - [Web Animations: property from [hue-rotate(180deg)\] to [none\] at (0.5) should be [hue-rotate(90deg)\]] expected: FAIL - [CSS Transitions: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (-1) should be [drop-shadow(-20px -10px white)\]] - expected: FAIL - [Web Animations: property from [none\] to [hue-rotate(180deg)\] at (1) should be [hue-rotate(180deg)\]] expected: FAIL @@ -62,15 +47,9 @@ [Web Animations: property from [none\] to [opacity(0.5) hue-rotate(180deg)\] at (0.5) should be [opacity(0.75) hue-rotate(90deg)\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0) should be [drop-shadow(0px 0px 0px currentcolor)\]] - expected: FAIL - [Web Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0) should be [drop-shadow(0px 0px 0px currentcolor)\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1.5) should be [drop-shadow(30px 15px #004100)\]] - expected: FAIL - [CSS Transitions: property from [drop-shadow(20px 10px blue)\] to [drop-shadow(20px 10px green)\] at (2147483648) should be [drop-shadow(20px 10px #00FF00\]] expected: FAIL @@ -86,9 +65,6 @@ [Web Animations: property from [none\] to [opacity(0.5) hue-rotate(180deg)\] at (-0.5) should be [opacity(1) hue-rotate(-90deg)\]] expected: FAIL - [CSS Transitions: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1) should be [drop-shadow(20px 10px green)\]] - expected: FAIL - [Web Animations: property from [hue-rotate(180deg)\] to [none\] at (1.5) should be [hue-rotate(-90deg)\]] expected: FAIL @@ -104,9 +80,6 @@ [Web Animations: property from [blur(6px)\] to [blur(10px) hue-rotate(180deg)\] at (0.5) should be [blur(8px) hue-rotate(90deg)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0.5) should be [drop-shadow(10px 5px #80C080)\]] - expected: FAIL - [Web Animations: property from [grayscale(0) blur(0px)\] to [blur(10px)\] at (0.6) should be [blur(10px)\]] expected: FAIL @@ -122,9 +95,6 @@ [Web Animations: property from [none\] to [opacity(0.5) hue-rotate(180deg)\] at (1) should be [opacity(0.5) hue-rotate(180deg)\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (-1) should be [drop-shadow(-20px -10px white)\]] - expected: FAIL - [Web Animations: property from [blur(6px)\] to [blur(10px) hue-rotate(180deg)\] at (0) should be [blur(6px) hue-rotate(0deg)\]] expected: FAIL @@ -134,36 +104,21 @@ [Web Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (-1) should be [drop-shadow(-20px -10px white)\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1) should be [drop-shadow(20px 10px green)\]] - expected: FAIL - [Web Animations: property from [blur(6px)\] to [blur(10px) hue-rotate(180deg)\] at (1.5) should be [blur(12px) hue-rotate(270deg)\]] expected: FAIL [Web Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1) should be [drop-shadow(20px 10px green)\]] expected: FAIL - [CSS Transitions: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0.5) should be [drop-shadow(10px 5px #80C080)\]] - expected: FAIL - [Web Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0.5) should be [drop-shadow(10px 5px #80C080)\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0.5) should be [drop-shadow(10px 5px #80C080)\]] - expected: FAIL - [Web Animations: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1.5) should be [drop-shadow(30px 15px #004100)\]] expected: FAIL [Web Animations: property from [none\] to [hue-rotate(180deg)\] at (1.5) should be [hue-rotate(270deg)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (1) should be [drop-shadow(20px 10px green)\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0) should be [drop-shadow(0px 0px 0px currentcolor)\]] - expected: FAIL - [CSS Animations: property from [grayscale(0) blur(0px)\] to [blur(10px)\] at (0.6) should be [blur(10px)\]] expected: FAIL diff --git a/tests/wpt/meta/css/filter-effects/animation/filter-interpolation-003.html.ini b/tests/wpt/meta/css/filter-effects/animation/filter-interpolation-003.html.ini index 60eff9eacf6..362a32ec3cd 100644 --- a/tests/wpt/meta/css/filter-effects/animation/filter-interpolation-003.html.ini +++ b/tests/wpt/meta/css/filter-effects/animation/filter-interpolation-003.html.ini @@ -14,9 +14,6 @@ [CSS Transitions with transition: all: property from [url("#svgfilter")\] to [none\] at (0) should be [none\]] expected: FAIL - [CSS Transitions: property from [none\] to [drop-shadow(20px 10px green)\] at (1) should be [drop-shadow(20px 10px green)\]] - expected: FAIL - [Web Animations: property from [opacity(0)\] to [none\] at (1.5) should be [opacity(1)\]] expected: FAIL @@ -41,9 +38,6 @@ [Web Animations: property from [none\] to [grayscale(1)\] at (-1) should be [grayscale(0)\]] expected: FAIL - [CSS Animations: property from [none\] to [drop-shadow(20px 10px green)\] at (0) should be [drop-shadow(0px 0px 0px transparent)\]] - expected: FAIL - [Web Animations: property from [url("#svgfilter")\] to [blur(5px)\] at (1.5) should be [blur(5px)\]] expected: FAIL @@ -80,9 +74,6 @@ [Web Animations: property from [initial\] to [sepia(1)\] at (0) should be [sepia(0)\]] expected: FAIL - [CSS Transitions: property from [none\] to [drop-shadow(20px 10px green)\] at (1.5) should be [drop-shadow(30px 15px #00C000)\]] - expected: FAIL - [Web Animations: property from [initial\] to [sepia(1)\] at (0.5) should be [sepia(0.5)\]] expected: FAIL @@ -116,27 +107,18 @@ [Web Animations: property from [none\] to [blur(10px)\] at (-1) should be [blur(0px)\]] expected: FAIL - [CSS Transitions with transition: all: property from [none\] to [drop-shadow(20px 10px green)\] at (0) should be [drop-shadow(0px 0px 0px transparent)\]] - expected: FAIL - [Web Animations: property from [none\] to [invert(1)\] at (1) should be [invert(1)\]] expected: FAIL [Web Animations: property from [none\] to [blur(10px)\] at (1) should be [blur(10px)\]] expected: FAIL - [CSS Animations: property from [none\] to [drop-shadow(20px 10px green)\] at (1) should be [drop-shadow(20px 10px green)\]] - expected: FAIL - [CSS Transitions with transition: all: property from [url("#svgfilter")\] to [blur(5px)\] at (-0.3) should be [blur(5px)\]] expected: FAIL [Web Animations: property from [none\] to [grayscale(1)\] at (0) should be [grayscale(0)\]] expected: FAIL - [CSS Transitions with transition: all: property from [none\] to [drop-shadow(20px 10px green)\] at (-1) should be [drop-shadow(-20px -10px transparent)\]] - expected: FAIL - [CSS Animations: property from [url("#svgfilter")\] to [none\] at (0) should be [url("#svgfilter")\]] expected: FAIL @@ -176,12 +158,6 @@ [Web Animations: property from [none\] to [blur(10px)\] at (1.5) should be [blur(15px)\]] expected: FAIL - [CSS Transitions with transition: all: property from [none\] to [drop-shadow(20px 10px green)\] at (0.5) should be [drop-shadow(10px 5px rgba(0, 128, 0, 0.5))\]] - expected: FAIL - - [CSS Animations: property from [none\] to [drop-shadow(20px 10px green)\] at (-1) should be [drop-shadow(-20px -10px transparent)\]] - expected: FAIL - [Web Animations: property from [contrast(0)\] to [none\] at (1) should be [contrast(1)\]] expected: FAIL @@ -221,9 +197,6 @@ [CSS Animations: property from [url("#svgfilter")\] to [blur(5px)\] at (-0.3) should be [url("#svgfilter")\]] expected: FAIL - [CSS Animations: property from [none\] to [drop-shadow(20px 10px green)\] at (1.5) should be [drop-shadow(30px 15px #00C000)\]] - expected: FAIL - [Web Animations: property from [url("#svgfilter")\] to [blur(5px)\] at (0.5) should be [blur(5px)\]] expected: FAIL @@ -257,9 +230,6 @@ [Web Animations: property from [url("#svgfilter")\] to [none\] at (1.5) should be [none\]] expected: FAIL - [CSS Transitions: property from [none\] to [drop-shadow(20px 10px green)\] at (-1) should be [drop-shadow(-20px -10px transparent)\]] - expected: FAIL - [Web Animations: property from [none\] to [invert(1)\] at (-1) should be [invert(0)\]] expected: FAIL @@ -293,12 +263,6 @@ [CSS Transitions with transition: all: property from [url("#svgfilter")\] to [none\] at (0.5) should be [none\]] expected: FAIL - [CSS Animations: property from [none\] to [drop-shadow(20px 10px green)\] at (0.5) should be [drop-shadow(10px 5px rgba(0, 128, 0, 0.5))\]] - expected: FAIL - - [CSS Transitions with transition: all: property from [none\] to [drop-shadow(20px 10px green)\] at (1) should be [drop-shadow(20px 10px green)\]] - expected: FAIL - [Web Animations: property from [none\] to [sepia(1)\] at (0.5) should be [sepia(0.5)\]] expected: FAIL @@ -311,9 +275,6 @@ [Web Animations: property from [none\] to [grayscale(1)\] at (1) should be [grayscale(1)\]] expected: FAIL - [CSS Transitions: property from [none\] to [drop-shadow(20px 10px green)\] at (0) should be [drop-shadow(0px 0px 0px transparent)\]] - expected: FAIL - [Web Animations: property from [url("#svgfilter")\] to [blur(5px)\] at (0.6) should be [blur(5px)\]] expected: FAIL @@ -341,9 +302,6 @@ [CSS Transitions: property from [url("#svgfilter")\] to [blur(5px)\] at (0.3) should be [blur(5px)\]] expected: FAIL - [CSS Transitions: property from [none\] to [drop-shadow(20px 10px green)\] at (0.5) should be [drop-shadow(10px 5px rgba(0, 128, 0, 0.5))\]] - expected: FAIL - [Web Animations: property from [saturate(0)\] to [none\] at (1.5) should be [saturate(1.5)\]] expected: FAIL @@ -362,9 +320,6 @@ [Web Animations: property from [url("#svgfilter")\] to [none\] at (0.6) should be [none\]] expected: FAIL - [CSS Transitions with transition: all: property from [none\] to [drop-shadow(20px 10px green)\] at (1.5) should be [drop-shadow(30px 15px #00C000)\]] - expected: FAIL - [CSS Transitions with transition: all: property from [url("#svgfilter")\] to [none\] at (1) should be [none\]] expected: FAIL diff --git a/tests/wpt/meta/css/filter-effects/animation/filter-interpolation-004.html.ini b/tests/wpt/meta/css/filter-effects/animation/filter-interpolation-004.html.ini index 869a4191404..8d02a3ed3d6 100644 --- a/tests/wpt/meta/css/filter-effects/animation/filter-interpolation-004.html.ini +++ b/tests/wpt/meta/css/filter-effects/animation/filter-interpolation-004.html.ini @@ -5,12 +5,6 @@ [Web Animations: property from [grayscale(0)\] to [grayscale()\] at (0) should be [grayscale(0)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (-1) should be [drop-shadow(-20px -10px blue)\]] - expected: FAIL - - [CSS Transitions: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (0) should be [drop-shadow(0px 0px blue)\]] - expected: FAIL - [Web Animations: property from [blur()\] to [blur(10px)\] at (-1) should be [blur(0px)\]] expected: FAIL @@ -23,21 +17,12 @@ [Web Animations: property from [hue-rotate()\] to [hue-rotate(360deg)\] at (0) should be [hue-rotate()\]] expected: FAIL - [CSS Transitions: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (0.5) should be [drop-shadow(10px 5px 15px rgb(0, 64, 128))\]] - expected: FAIL - [Web Animations: property from [invert(0)\] to [invert()\] at (0) should be [invert(0)\]] expected: FAIL [Web Animations: property from [brightness(0)\] to [brightness()\] at (1) should be [brightness()\]] expected: FAIL - [CSS Transitions: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (1.5) should be [drop-shadow(30px 15px 45px rgb(0, 192, 0))\]] - expected: FAIL - - [CSS Animations: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (0) should be [drop-shadow(0px 0px blue)\]] - expected: FAIL - [Web Animations: property from [contrast(0)\] to [contrast()\] at (1.5) should be [contrast(1.5)\]] expected: FAIL @@ -53,15 +38,9 @@ [Web Animations: property from [brightness(0)\] to [brightness()\] at (1.5) should be [brightness(1.5)\]] expected: FAIL - [CSS Transitions: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (1) should be [drop-shadow(20px 10px 30px green)\]] - expected: FAIL - [Web Animations: property from [invert(0)\] to [invert()\] at (-1) should be [invert(0)\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (1) should be [drop-shadow(20px 10px 30px green)\]] - expected: FAIL - [Web Animations: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (1.5) should be [drop-shadow(30px 15px 45px rgb(0, 192, 0))\]] expected: FAIL @@ -80,9 +59,6 @@ [Web Animations: property from [opacity(0)\] to [opacity()\] at (1) should be [opacity()\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (-1) should be [drop-shadow(-20px -10px blue)\]] - expected: FAIL - [Web Animations: property from [opacity(0)\] to [opacity()\] at (-1) should be [opacity(0)\]] expected: FAIL @@ -95,9 +71,6 @@ [Web Animations: property from [opacity(0)\] to [opacity()\] at (0) should be [opacity(0)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (1.5) should be [drop-shadow(30px 15px 45px rgb(0, 192, 0))\]] - expected: FAIL - [Web Animations: property from [sepia(0)\] to [sepia()\] at (1) should be [sepia()\]] expected: FAIL @@ -110,15 +83,6 @@ [Web Animations: property from [saturate(0)\] to [saturate()\] at (-1) should be [saturate(0)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (0) should be [drop-shadow(0px 0px blue)\]] - expected: FAIL - - [CSS Animations: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (1.5) should be [drop-shadow(30px 15px 45px rgb(0, 192, 0))\]] - expected: FAIL - - [CSS Transitions: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (-1) should be [drop-shadow(-20px -10px blue)\]] - expected: FAIL - [Web Animations: property from [grayscale(0)\] to [grayscale()\] at (1) should be [grayscale()\]] expected: FAIL @@ -158,9 +122,6 @@ [Web Animations: property from [opacity(0)\] to [opacity()\] at (0.5) should be [opacity(0.5)\]] expected: FAIL - [CSS Animations: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (0.5) should be [drop-shadow(10px 5px 15px rgb(0, 64, 128))\]] - expected: FAIL - [Web Animations: property from [contrast(0)\] to [contrast()\] at (0) should be [contrast(0)\]] expected: FAIL @@ -170,18 +131,12 @@ [Web Animations: property from [brightness(0)\] to [brightness()\] at (-1) should be [brightness(0)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (1) should be [drop-shadow(20px 10px 30px green)\]] - expected: FAIL - [Web Animations: property from [contrast(0)\] to [contrast()\] at (-1) should be [contrast(0)\]] expected: FAIL [Web Animations: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (-1) should be [drop-shadow(-20px -10px blue)\]] expected: FAIL - [CSS Transitions with transition: all: property from [drop-shadow(0px 0px)\] to [drop-shadow(20px 10px 30px green)\] at (0.5) should be [drop-shadow(10px 5px 15px rgb(0, 64, 128))\]] - expected: FAIL - [Web Animations: property from [blur()\] to [blur(10px)\] at (1.5) should be [blur(15px)\]] expected: FAIL @@ -193,4 +148,3 @@ [Web Animations: property from [contrast(0)\] to [contrast()\] at (1) should be [contrast()\]] expected: FAIL - diff --git a/tests/wpt/meta/css/filter-effects/filters-drop-shadow-001.html.ini b/tests/wpt/meta/css/filter-effects/filters-drop-shadow-001.html.ini deleted file mode 100644 index 180e39f034b..00000000000 --- a/tests/wpt/meta/css/filter-effects/filters-drop-shadow-001.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[filters-drop-shadow-001.html] - expected: FAIL diff --git a/tests/wpt/meta/css/filter-effects/parsing/filter-computed.html.ini b/tests/wpt/meta/css/filter-effects/parsing/filter-computed.html.ini index 88dd921e1f9..5b56dd43bc6 100644 --- a/tests/wpt/meta/css/filter-effects/parsing/filter-computed.html.ini +++ b/tests/wpt/meta/css/filter-effects/parsing/filter-computed.html.ini @@ -1,10 +1,3 @@ [filter-computed.html] [Property filter value 'blur(10px) url("https://www.example.com/picture.svg#f") contrast(20) brightness(30)'] expected: FAIL - - [Property filter value 'drop-shadow(1px 2px)'] - expected: FAIL - - [Property filter value 'drop-shadow(rgb(4, 5, 6) 1px 2px 0px)'] - expected: FAIL - diff --git a/tests/wpt/meta/css/filter-effects/parsing/filter-parsing-valid.html.ini b/tests/wpt/meta/css/filter-effects/parsing/filter-parsing-valid.html.ini index 3d6570746a8..a1e44815acd 100644 --- a/tests/wpt/meta/css/filter-effects/parsing/filter-parsing-valid.html.ini +++ b/tests/wpt/meta/css/filter-effects/parsing/filter-parsing-valid.html.ini @@ -2,27 +2,8 @@ [e.style['filter'\] = "url(\\"https://www.example.com/picture.svg#f\\")" should set the property value] expected: FAIL - [e.style['filter'\] = "drop-shadow(0 0 0)" should set the property value] - expected: FAIL - [e.style['filter'\] = "url(picture.svg#f)" should set the property value] expected: FAIL [e.style['filter'\] = "blur(10px) url(\\"picture.svg#f\\") contrast(20) brightness(30)" should set the property value] expected: FAIL - - [e.style['filter'\] = "drop-shadow(rgba(4, 5, 6, 0.75) 1px 2px 3px)" should set the property value] - expected: FAIL - - [e.style['filter'\] = "drop-shadow(rgb(4, 5, 6) 1px 2px)" should set the property value] - expected: FAIL - - [e.style['filter'\] = "drop-shadow(1px 2px 3px)" should set the property value] - expected: FAIL - - [e.style['filter'\] = "drop-shadow(1px 2px)" should set the property value] - expected: FAIL - - [e.style['filter'\] = "drop-shadow(1px 2px rgb(4, 5, 6))" should set the property value] - expected: FAIL -