mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Auto merge of #16363 - Manishearth:stylo-prefixed, r=upsuper
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:
commit
3c5a21ebf3
2 changed files with 12 additions and 5 deletions
|
@ -201,7 +201,14 @@ ${helpers.predefined_type("flex-basis",
|
|||
${MinMax}Length::${initial}
|
||||
}
|
||||
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 {
|
||||
|
|
|
@ -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,
|
||||
// height, block-size, and inline-size.
|
||||
define_css_keyword_enum!(ExtremumLength:
|
||||
"max-content" => MaxContent,
|
||||
"min-content" => MinContent,
|
||||
"fit-content" => FitContent,
|
||||
"fill-available" => FillAvailable);
|
||||
"-moz-max-content" => MaxContent,
|
||||
"-moz-min-content" => MinContent,
|
||||
"-moz-fit-content" => FitContent,
|
||||
"-moz-available" => FillAvailable);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue