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

Treat top-level number in calc() invalid

Browse source 
Currently, CalcLengthOrPercentage doesn't actually keep the number
value, so if we don't treat it invalid, we can end up generating empty
`calc()` value when one contains top-level numbers (e.g. `calc(1)`),
which would violate assertion elsewhere that `calc` must not be empty.
This commit is contained in:
Xidorn Quan 2016-11-30 18:31:32 +11:00 • committed by Xidorn Quan
parent f159b5cb10
commit 6fec4d7645
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/style/values/specified/length.rs
View file

@ -554,8 +554,8 @@ impl CalcLengthOrPercentage {
CalcLengthOrPercentage::parse(input, CalcUnit::LengthOrPercentage) CalcLengthOrPercentage::parse(input, CalcUnit::LengthOrPercentage)
} }
fn parse(input: &mut Parser, pub fn parse(input: &mut Parser,
expected_unit: CalcUnit) -> Result<CalcLengthOrPercentage, ()> { expected_unit: CalcUnit) -> Result<CalcLengthOrPercentage, ()> {
let ast = try!(CalcLengthOrPercentage::parse_sum(input, expected_unit)); let ast = try!(CalcLengthOrPercentage::parse_sum(input, expected_unit));
let mut simplified = Vec::new(); let mut simplified = Vec::new();
@ -576,7 +576,6 @@ impl CalcLengthOrPercentage {
let mut ch = None; let mut ch = None;
let mut rem = None; let mut rem = None;
let mut percentage = None; let mut percentage = None;
let mut number = None;
for value in simplified { for value in simplified {
match value { match value {
@ -606,7 +605,7 @@ impl CalcLengthOrPercentage {
FontRelativeLength::Rem(val) => FontRelativeLength::Rem(val) =>
rem = Some(rem.unwrap_or(0.) + val), rem = Some(rem.unwrap_or(0.) + val),
}, },
SimplifiedValueNode::Number(val) => number = Some(number.unwrap_or(0.) + val), // TODO Add support for top level number in calc(). See servo/servo#14421.
_ => return Err(()), _ => return Err(()),
} }
} }

21
tests/unit/style/value.rs
View file

@ -3,8 +3,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use app_units::Au; use app_units::Au;
use cssparser::Parser;
use style::values::HasViewportPercentage; use style::values::HasViewportPercentage;
use style::values::specified::{ViewportPercentageLength, Length}; use style::values::specified::{ViewportPercentageLength, Length};
use style::values::specified::length::{CalcLengthOrPercentage, CalcUnit};
#[test] #[test]
fn length_has_viewport_percentage() { fn length_has_viewport_percentage() {
@ -13,3 +15,22 @@ fn length_has_viewport_percentage() {
let l = Length::Absolute(Au(100)); let l = Length::Absolute(Au(100));
assert!(!l.has_viewport_percentage()); assert!(!l.has_viewport_percentage());
} }
#[test]
fn calc_top_level_number_with_unit() {
fn parse(text: &str, unit: CalcUnit) -> Result<CalcLengthOrPercentage, ()> {
let mut parser = Parser::new(text);
CalcLengthOrPercentage::parse(&mut parser, unit)
}
assert_eq!(parse("1", CalcUnit::Length), Err(()));
assert_eq!(parse("1", CalcUnit::LengthOrPercentage), Err(()));
assert_eq!(parse("1", CalcUnit::Angle), Err(()));
assert_eq!(parse("1", CalcUnit::Time), Err(()));
assert_eq!(parse("1px + 1", CalcUnit::Length), Err(()));
assert_eq!(parse("1em + 1", CalcUnit::Length), Err(()));
assert_eq!(parse("1px + 1", CalcUnit::LengthOrPercentage), Err(()));
assert_eq!(parse("1% + 1", CalcUnit::LengthOrPercentage), Err(()));
assert_eq!(parse("1rad + 1", CalcUnit::Angle), Err(()));
assert_eq!(parse("1deg + 1", CalcUnit::Angle), Err(()));
assert_eq!(parse("1s + 1", CalcUnit::Time), Err(()));
}