Skip to content

Commit

Permalink
style: Let logical height, block-size, accept keywords.
Browse files Browse the repository at this point in the history
We should let block-size/min-block-size/max-block-size accept keywords as the
initial value, just like width in vertical writing mode or height in horizontal
writing mode.

Differential Revision: https://phabricator.services.mozilla.com/D14320
  • Loading branch information
BorisChiou authored and emilio committed Jan 6, 2019
1 parent b7e728a commit 6275595
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 33 deletions.
11 changes: 0 additions & 11 deletions components/style/properties/longhands/position.mako.rs
Expand Up @@ -244,21 +244,12 @@ ${helpers.predefined_type(
if logical:
spec = "https://drafts.csswg.org/css-logical-props/#propdef-%s"
%>
// NOTE: Block-size doesn't support -moz-*-content keywords, since they make
// no sense on the block axis, but it simplifies things the have that it has
// the same type as the other properties, since otherwise we'd need to
// handle logical props where the types are different, which looks like a
// pain.
% if product == "gecko":
<%
parse_function = "parse" if size != "block-size" else "parse_disallow_keyword"
%>
// width, height, block-size, inline-size
${helpers.predefined_type(
size,
"MozLength",
"computed::MozLength::auto()",
parse_function,
logical=logical,
logical_group="size",
allow_quirks=not logical,
Expand All @@ -272,7 +263,6 @@ ${helpers.predefined_type(
"min-%s" % size,
"MozLength",
"computed::MozLength::auto()",
parse_function,
logical=logical,
logical_group="min-size",
allow_quirks=not logical,
Expand All @@ -284,7 +274,6 @@ ${helpers.predefined_type(
"max-%s" % size,
"MaxLength",
"computed::MaxLength::none()",
parse_function,
logical=logical,
logical_group="max-size",
allow_quirks=not logical,
Expand Down
22 changes: 0 additions & 22 deletions components/style/values/specified/length.rs
Expand Up @@ -1256,17 +1256,6 @@ impl Parse for MozLength {
}

impl MozLength {
/// Parses, without quirks, and disallowing ExtremumLength values.
///
/// Used for logical props in the block direction.
pub fn parse_disallow_keyword<'i, 't>(
context: &ParserContext,
input: &mut Parser<'i, 't>,
) -> Result<Self, ParseError<'i>> {
let length = LengthOrPercentageOrAuto::parse_non_negative(context, input)?;
Ok(GenericMozLength::LengthOrPercentageOrAuto(length))
}

/// Parses, with quirks.
pub fn parse_quirky<'i, 't>(
context: &ParserContext,
Expand Down Expand Up @@ -1308,17 +1297,6 @@ impl Parse for MaxLength {
}

impl MaxLength {
/// Parses, without quirks, and disallowing ExtremumLength values.
///
/// Used for logical props in the block direction.
pub fn parse_disallow_keyword<'i, 't>(
context: &ParserContext,
input: &mut Parser<'i, 't>,
) -> Result<Self, ParseError<'i>> {
let length = LengthOrPercentageOrNone::parse_non_negative(context, input)?;
Ok(GenericMaxLength::LengthOrPercentageOrNone(length))
}

/// Parses, with quirks.
pub fn parse_quirky<'i, 't>(
context: &ParserContext,
Expand Down

0 comments on commit 6275595

Please sign in to comment.