Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-02 20:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Add basic support for nan / infinity in calc()

Browse source 
Fix some tests to:

  * Not assume `double` precision.
  * Account for recent working group resolution with regards to NaN: https://github.com/w3c/csswg-drafts/issues/7067#issuecomment-1111211295

Not sure I caught all, but normalizing to 0 was already our existing
behavior. This feature needs more work before it can be enabled more
generally, so make it nightly-only, for now.

Also, it's unclear per spec what the serialization for infinity*1s or so
should be. Right now we serialize to <very-big-number>s, which seems
reasonable, but some tests (but not others!) expect different behavior.

I left those untouched for now.

Differential Revision: https://phabricator.services.mozilla.com/D154883
This commit is contained in:
Emilio Cobos Álvarez 2022-08-18 08:54:30 +00:00 • committed by Martin Robinson
parent dd849de9d9
commit cc09c2ffb1
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
components/style/values/specified/calc.rs
View file

@ -20,6 +20,14 @@ use std::fmt::{self, Write};
use style_traits::values::specified::AllowedNumericType;
use style_traits::{CssWriter, ParseError, SpecifiedValueInfo, StyleParseErrorKind, ToCss};
fn trig_enabled() -> bool {
static_prefs::pref!("layout.css.trig.enabled")
}
fn nan_inf_enabled() -> bool {
static_prefs::pref!("layout.css.nan-inf.enabled")
}
/// The name of the mathematical function that we're parsing.
#[derive(Clone, Copy, Debug, Parse)]
pub enum MathFunction {
@ -349,12 +357,12 @@ impl CalcNode {
CalcNode::parse(context, input, function, allowed_units)
},
&Token::Ident(ref ident) => {
if !trig_enabled() {
return Err(location.new_unexpected_token_error(Token::Ident(ident.clone())));
}
let number = match_ignore_ascii_case! { &**ident,
"e" => std::f32::consts::E,
"pi" => std::f32::consts::PI,
"e" if trig_enabled() => std::f32::consts::E,
"pi" if trig_enabled() => std::f32::consts::PI,
"infinity" if nan_inf_enabled() => f32::INFINITY,
"-infinity" if nan_inf_enabled() => f32::NEG_INFINITY,
"nan" if nan_inf_enabled() => f32::NAN,
_ => return Err(location.new_unexpected_token_error(Token::Ident(ident.clone()))),
};
Ok(CalcNode::Leaf(Leaf::Number(number)))
@ -579,12 +587,10 @@ impl CalcNode {
//
// TODO(emilio): Eventually it should be.
let number = match rhs.to_number() {
Ok(n) if n != 0. => n,
_ => {
return Err(
input.new_custom_error(StyleParseErrorKind::UnspecifiedError)
);
},
Ok(n) if n != 0. || nan_inf_enabled() => n,
_ => return Err(
input.new_custom_error(StyleParseErrorKind::UnspecifiedError)
),
};
node.mul_by(1. / number);
},