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

Auto merge of #16363 - Manishearth:stylo-prefixed, r=upsuper

Browse source 
stylo: Use prefixed values in ExtremumLength

r=xidorn https://bugzilla.mozilla.org/show_bug.cgi?id=1355674

<!-- 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/16363)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-12 00:13:51 -05:00 • committed by GitHub
commit 3c5a21ebf3
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -201,7 +201,14 @@ ${helpers.predefined_type("flex-basis",
${MinMax}Length::${initial} ${MinMax}Length::${initial}
} }
fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> { fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> {
${MinMax}Length::parse(context, input).map(SpecifiedValue) let ret = ${MinMax}Length::parse(context, input);
// Keyword values don't make sense in the block direction; don't parse them
% if "block" in size:
if let Ok(${MinMax}Length::ExtremumLength(..)) = ret {
return Err(())
}
% endif
ret.map(SpecifiedValue)
} }
impl ToCss for SpecifiedValue { impl ToCss for SpecifiedValue {

8
components/style/values/mod.rs
View file

@ -192,7 +192,7 @@ impl<A: ToComputedValue, B: ToComputedValue> ToComputedValue for Either<A, B> {
// A type for possible values for min- and max- flavors of width, // A type for possible values for min- and max- flavors of width,
// height, block-size, and inline-size. // height, block-size, and inline-size.
define_css_keyword_enum!(ExtremumLength: define_css_keyword_enum!(ExtremumLength:
"max-content" => MaxContent, "-moz-max-content" => MaxContent,
"min-content" => MinContent, "-moz-min-content" => MinContent,
"fit-content" => FitContent, "-moz-fit-content" => FitContent,
"fill-available" => FillAvailable); "-moz-available" => FillAvailable);