From 4483a7694a9576599a474726d366e0d39b12bd52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= Date: Fri, 28 Apr 2017 21:15:51 +0300 Subject: [PATCH] stylo: Use computed Angle in computed value of filter property Using specified Angle was wrong because it can keep calc value and serialize with calc(). Also that will allow us to pass angle unit later. --- components/style/properties/longhand/effects.mako.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/components/style/properties/longhand/effects.mako.rs b/components/style/properties/longhand/effects.mako.rs index 7fde2f816e28..b7bcffadbd35 100644 --- a/components/style/properties/longhand/effects.mako.rs +++ b/components/style/properties/longhand/effects.mako.rs @@ -139,7 +139,7 @@ ${helpers.predefined_type("clip", use app_units::Au; use values::CSSFloat; use values::computed::{CSSColor, Shadow}; - use values::specified::Angle; + use values::computed::Angle; use values::specified::url::SpecifiedUrl; #[derive(Clone, PartialEq, Debug)] @@ -382,7 +382,9 @@ ${helpers.predefined_type("clip", SpecifiedFilter::Brightness(factor) => computed_value::Filter::Brightness(factor), SpecifiedFilter::Contrast(factor) => computed_value::Filter::Contrast(factor), SpecifiedFilter::Grayscale(factor) => computed_value::Filter::Grayscale(factor), - SpecifiedFilter::HueRotate(factor) => computed_value::Filter::HueRotate(factor), + SpecifiedFilter::HueRotate(ref factor) => { + computed_value::Filter::HueRotate(factor.to_computed_value(context)) + }, SpecifiedFilter::Invert(factor) => computed_value::Filter::Invert(factor), SpecifiedFilter::Opacity(factor) => computed_value::Filter::Opacity(factor), SpecifiedFilter::Saturate(factor) => computed_value::Filter::Saturate(factor), @@ -407,7 +409,9 @@ ${helpers.predefined_type("clip", computed_value::Filter::Brightness(factor) => SpecifiedFilter::Brightness(factor), computed_value::Filter::Contrast(factor) => SpecifiedFilter::Contrast(factor), computed_value::Filter::Grayscale(factor) => SpecifiedFilter::Grayscale(factor), - computed_value::Filter::HueRotate(factor) => SpecifiedFilter::HueRotate(factor), + computed_value::Filter::HueRotate(ref factor) => { + SpecifiedFilter::HueRotate(ToComputedValue::from_computed_value(factor)) + }, computed_value::Filter::Invert(factor) => SpecifiedFilter::Invert(factor), computed_value::Filter::Opacity(factor) => SpecifiedFilter::Opacity(factor), computed_value::Filter::Saturate(factor) => SpecifiedFilter::Saturate(factor),