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

Handle single X keyword value in LegacyPosition

Browse source
This commit is contained in:
Nazım Can Altınova 2017-08-18 11:01:41 -07:00
parent e23ae30489
commit 692d009e32
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/style/values/specified/position.rs
View file

@ -320,11 +320,6 @@ impl LegacyPosition {
return Ok(Self::new(x_pos, y_pos)); return Ok(Self::new(x_pos, y_pos));
}, },
Ok(OriginComponent::Side(x_keyword)) => { Ok(OriginComponent::Side(x_keyword)) => {
if input.try(|i| i.expect_ident_matching("center")).is_ok() {
let x_pos = OriginComponent::Side(x_keyword);
let y_pos = OriginComponent::Center;
return Ok(Self::new(x_pos, y_pos));
}
if let Ok(y_keyword) = input.try(Y::parse) { if let Ok(y_keyword) = input.try(Y::parse) {
let x_pos = OriginComponent::Side(x_keyword); let x_pos = OriginComponent::Side(x_keyword);
let y_pos = OriginComponent::Side(y_keyword); let y_pos = OriginComponent::Side(y_keyword);
@ -334,6 +329,8 @@ impl LegacyPosition {
if let Ok(y_lop) = input.try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) { if let Ok(y_lop) = input.try(|i| LengthOrPercentage::parse_quirky(context, i, allow_quirks)) {
return Ok(Self::new(x_pos, OriginComponent::Length(y_lop))) return Ok(Self::new(x_pos, OriginComponent::Length(y_lop)))
} }
let _ = input.try(|i| i.expect_ident_matching("center"));
return Ok(Self::new(x_pos, OriginComponent::Center));
}, },
Ok(x_pos @ OriginComponent::Length(_)) => { Ok(x_pos @ OriginComponent::Length(_)) => {
if let Ok(y_keyword) = input.try(Y::parse) { if let Ok(y_keyword) = input.try(Y::parse) {
@ -344,9 +341,8 @@ impl LegacyPosition {
let y_pos = OriginComponent::Length(y_lop); let y_pos = OriginComponent::Length(y_lop);
return Ok(Self::new(x_pos, y_pos)); return Ok(Self::new(x_pos, y_pos));
} }
let y_pos = OriginComponent::Center;
let _ = input.try(|i| i.expect_ident_matching("center")); let _ = input.try(|i| i.expect_ident_matching("center"));
return Ok(Self::new(x_pos, y_pos)); return Ok(Self::new(x_pos, OriginComponent::Center));
}, },
Err(_) => {}, Err(_) => {},
} }