From 190e9b9715797a595b2b08ce3991c43cbb816384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Wed, 31 Jan 2018 22:09:53 +0100 Subject: [PATCH] style: Tidy and sprinkle some comments. --- components/style/values/generics/mod.rs | 7 ++++++- components/style/values/specified/font.rs | 1 + components/style/values/specified/length.rs | 13 ++++++++----- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/components/style/values/generics/mod.rs b/components/style/values/generics/mod.rs index 263db6890d2..6a3e661fb23 100644 --- a/components/style/values/generics/mod.rs +++ b/components/style/values/generics/mod.rs @@ -243,6 +243,8 @@ impl ToCss for FontSettingTagInt { 1 => Ok(()), 0 => dest.write_str(" off"), x => { + // FIXME(emilio): Why in the world does this serialize the space + // itself? dest.write_char(' ')?; x.to_css(dest) } @@ -252,6 +254,7 @@ impl ToCss for FontSettingTagInt { impl Parse for FontSettingTagInt { fn parse<'i, 't>(_context: &ParserContext, input: &mut Parser<'i, 't>) -> Result> { + // FIXME(emilio): This doesn't handle calc properly. if let Ok(value) = input.try(|input| input.expect_integer()) { // handle integer, throw if it is negative if value >= 0 { @@ -272,9 +275,11 @@ impl Parse for FontSettingTagInt { } } - impl Parse for FontSettingTagFloat { fn parse<'i, 't>(_: &ParserContext, input: &mut Parser<'i, 't>) -> Result> { + // FIXME(emilio): Should handle calc() using Number::parse. + // + // Also why is this not in font.rs? input.expect_number().map(FontSettingTagFloat).map_err(|e| e.into()) } } diff --git a/components/style/values/specified/font.rs b/components/style/values/specified/font.rs index 4905bed33b4..e7319b2a4e9 100644 --- a/components/style/values/specified/font.rs +++ b/components/style/values/specified/font.rs @@ -2060,6 +2060,7 @@ pub enum MozScriptLevel { impl Parse for MozScriptLevel { fn parse<'i, 't>(_: &ParserContext, input: &mut Parser<'i, 't>) -> Result> { + // We don't bother to handle calc here. if let Ok(i) = input.try(|i| i.expect_integer()) { return Ok(MozScriptLevel::Relative(i)) } diff --git a/components/style/values/specified/length.rs b/components/style/values/specified/length.rs index cb83b80abf9..bd9524ec9bd 100644 --- a/components/style/values/specified/length.rs +++ b/components/style/values/specified/length.rs @@ -825,8 +825,10 @@ impl LengthOrPercentage { /// Parse a length, treating dimensionless numbers as pixels /// /// - pub fn parse_numbers_are_pixels<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) - -> Result> { + pub fn parse_numbers_are_pixels<'i, 't>( + context: &ParserContext, + input: &mut Parser<'i, 't>, + ) -> Result> { if let Ok(lop) = input.try(|i| Self::parse(context, i)) { return Ok(lop) } @@ -840,9 +842,10 @@ impl LengthOrPercentage { /// Parse a non-negative length, treating dimensionless numbers as pixels /// /// This is nonstandard behavior used by Firefox for SVG - pub fn parse_numbers_are_pixels_non_negative<'i, 't>(context: &ParserContext, - input: &mut Parser<'i, 't>) - -> Result> { + pub fn parse_numbers_are_pixels_non_negative<'i, 't>( + context: &ParserContext, + input: &mut Parser<'i, 't>, + ) -> Result> { if let Ok(lop) = input.try(|i| Self::parse_non_negative(context, i)) { return Ok(lop) }