From 39ae0bbf478e28f09dbdae052e052a14d6329e09 Mon Sep 17 00:00:00 2001 From: Ravi Shankar Date: Tue, 24 Jan 2017 20:20:34 +0530 Subject: [PATCH] Change LengthOrPercentageOrNone to use NoCalcLength --- components/style/values/specified/length.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/style/values/specified/length.rs b/components/style/values/specified/length.rs index ec7b6fd7f6d..56b48ab6db6 100644 --- a/components/style/values/specified/length.rs +++ b/components/style/values/specified/length.rs @@ -1057,7 +1057,7 @@ impl Parse for LengthOrPercentageOrAuto { #[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[allow(missing_docs)] pub enum LengthOrPercentageOrNone { - Length(Length), + Length(NoCalcLength), Percentage(Percentage), Calc(Box), None, @@ -1089,11 +1089,11 @@ impl LengthOrPercentageOrNone { { match try!(input.next()) { Token::Dimension(ref value, ref unit) if context.is_ok(value.value) => - Length::parse_dimension(value.value, unit).map(LengthOrPercentageOrNone::Length), + NoCalcLength::parse_dimension(value.value, unit).map(LengthOrPercentageOrNone::Length), Token::Percentage(ref value) if context.is_ok(value.unit_value) => Ok(LengthOrPercentageOrNone::Percentage(Percentage(value.unit_value))), Token::Number(ref value) if value.value == 0. => - Ok(LengthOrPercentageOrNone::Length(Length::zero())), + Ok(LengthOrPercentageOrNone::Length(NoCalcLength::zero())), Token::Function(ref name) if name.eq_ignore_ascii_case("calc") => { let calc = try!(input.parse_nested_block(CalcLengthOrPercentage::parse_length_or_percentage)); Ok(LengthOrPercentageOrNone::Calc(Box::new(calc)))