Skip to content

Commit

Permalink
stylo: Use computed Angle in computed value of filter property
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
canova committed May 1, 2017
1 parent ecc8181 commit 4483a76
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions components/style/properties/longhand/effects.mako.rs
Expand Up @@ -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)]
Expand Down Expand Up @@ -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),
Expand All @@ -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),
Expand Down

0 comments on commit 4483a76

Please sign in to comment.