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

Auto merge of #16435 - nox:parse-origin, r=emilio

Browse source 
Fix parsing of "center left" in parse_origin (fixes #15750)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16435)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-14 03:16:51 -05:00 • committed by GitHub
commit f7896fd80b
2 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/style/properties/longhand/effects.mako.rs
View file

@ -439,7 +439,7 @@ pub struct OriginParseResult {
pub fn parse_origin(context: &ParserContext, input: &mut Parser) -> Result<OriginParseResult,()> { pub fn parse_origin(context: &ParserContext, input: &mut Parser) -> Result<OriginParseResult,()> {
use values::specified::{LengthOrPercentage, Percentage}; use values::specified::{LengthOrPercentage, Percentage};
let (mut horizontal, mut vertical, mut depth) = (None, None, None); let (mut horizontal, mut vertical, mut depth, mut horizontal_is_center) = (None, None, None, false);
loop { loop {
if let Err(_) = input.try(|input| { if let Err(_) = input.try(|input| {
let token = try!(input.expect_ident()); let token = try!(input.expect_ident());
@ -448,12 +448,16 @@ pub fn parse_origin(context: &ParserContext, input: &mut Parser) -> Result<Origi
"left" => { "left" => {
if horizontal.is_none() { if horizontal.is_none() {
horizontal = Some(LengthOrPercentage::Percentage(Percentage(0.0))) horizontal = Some(LengthOrPercentage::Percentage(Percentage(0.0)))
} else if horizontal_is_center && vertical.is_none() {
vertical = Some(LengthOrPercentage::Percentage(Percentage(0.5)));
horizontal = Some(LengthOrPercentage::Percentage(Percentage(0.0)));
} else { } else {
return Err(()) return Err(())
} }
}, },
"center" => { "center" => {
if horizontal.is_none() { if horizontal.is_none() {
horizontal_is_center = true;
horizontal = Some(LengthOrPercentage::Percentage(Percentage(0.5))) horizontal = Some(LengthOrPercentage::Percentage(Percentage(0.5)))
} else if vertical.is_none() { } else if vertical.is_none() {
vertical = Some(LengthOrPercentage::Percentage(Percentage(0.5))) vertical = Some(LengthOrPercentage::Percentage(Percentage(0.5)))
@ -464,6 +468,9 @@ pub fn parse_origin(context: &ParserContext, input: &mut Parser) -> Result<Origi
"right" => { "right" => {
if horizontal.is_none() { if horizontal.is_none() {
horizontal = Some(LengthOrPercentage::Percentage(Percentage(1.0))) horizontal = Some(LengthOrPercentage::Percentage(Percentage(1.0)))
} else if horizontal_is_center && vertical.is_none() {
vertical = Some(LengthOrPercentage::Percentage(Percentage(0.5)));
horizontal = Some(LengthOrPercentage::Percentage(Percentage(1.0)));
} else { } else {
return Err(()) return Err(())
} }

17
tests/unit/style/parsing/effects.rs
View file

@ -51,10 +51,25 @@ fn test_longhands_parse_origin() {
assert!(parsed.is_ok()); assert!(parsed.is_ok());
assert_eq!(parser.is_exhausted(), true); assert_eq!(parser.is_exhausted(), true);
let mut parser = Parser::new("1px"); let mut parser = Parser::new("center left");
let parsed = longhands::parse_origin(&context, &mut parser); let parsed = longhands::parse_origin(&context, &mut parser);
assert!(parsed.is_ok()); assert!(parsed.is_ok());
assert_eq!(parser.is_exhausted(), true); assert_eq!(parser.is_exhausted(), true);
let mut parser = Parser::new("center right");
let parsed = longhands::parse_origin(&context, &mut parser);
assert!(parsed.is_ok());
assert_eq!(parser.is_exhausted(), true);
let mut parser = Parser::new("center right 1px");
let parsed = longhands::parse_origin(&context, &mut parser);
assert!(parsed.is_ok());
assert_eq!(parser.is_exhausted(), true);
let mut parser = Parser::new("1% right");
let parsed = longhands::parse_origin(&context, &mut parser);
assert!(parsed.is_ok());
assert_eq!(parser.is_exhausted(), false);
} }
#[test] #[test]