mirror of
https://github.com/servo/servo.git
synced 2025-07-23 23:33:43 +01:00
Auto merge of #11948 - stshine:flex-shorthand-properties, r=emilio
Support 'flex' and 'flex-flow' shorthand properties <!-- Please describe your changes on the following line: --> Support the `flex` and `flex-flow` shorthand properties in servo. Currently they are marked as experimental, so they are added to `__dir__.ini`. Thanks SimonSapin and jdm for help :) --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] There are tests for these changes <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11948) <!-- Reviewable:end -->
This commit is contained in:
bors-servo
GitHub
commit
0d76cf8e5c
24 changed files with 96 additions and 93 deletions
|
|
@ -308,6 +308,9 @@ partial interface CSSStyleDeclaration {
|
|||
[SetterThrows, TreatNullAs=EmptyString] attribute DOMString transitionDelay;
|
||||
[SetterThrows, TreatNullAs=EmptyString] attribute DOMString transition-delay;
|
||||
|
||||
[SetterThrows, TreatNullAs=EmptyString] attribute DOMString flex;
|
||||
[SetterThrows, TreatNullAs=EmptyString] attribute DOMString flexFlow;
|
||||
[SetterThrows, TreatNullAs=EmptyString] attribute DOMString flex-flow;
|
||||
[SetterThrows, TreatNullAs=EmptyString] attribute DOMString flexDirection;
|
||||
[SetterThrows, TreatNullAs=EmptyString] attribute DOMString flex-direction;
|
||||
[SetterThrows, TreatNullAs=EmptyString] attribute DOMString flexWrap;
|
||||
|
|
|
|||
|
|
@ -129,6 +129,7 @@ pub mod shorthands {
|
|||
<%include file="/shorthand/margin.mako.rs" />
|
||||
<%include file="/shorthand/outline.mako.rs" />
|
||||
<%include file="/shorthand/padding.mako.rs" />
|
||||
<%include file="/shorthand/position.mako.rs" />
|
||||
<%include file="/shorthand/text.mako.rs" />
|
||||
}
|
||||
|
||||
|
|
|
|||
88
components/style/properties/shorthand/position.mako.rs
Normal file
88
components/style/properties/shorthand/position.mako.rs
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
<%namespace name="helpers" file="/helpers.mako.rs" />
|
||||
|
||||
// https://drafts.csswg.org/css-flexbox/#flex-flow-property
|
||||
<%helpers:shorthand name="flex-flow" sub_properties="flex-direction flex-wrap"
|
||||
experimental="True">
|
||||
use properties::longhands::{flex_direction, flex_wrap};
|
||||
|
||||
let mut direction = None;
|
||||
let mut wrap = None;
|
||||
loop {
|
||||
if direction.is_none() {
|
||||
if let Ok(value) = input.try(|input| flex_direction::parse(context, input)) {
|
||||
direction = Some(value);
|
||||
continue
|
||||
}
|
||||
}
|
||||
if wrap.is_none() {
|
||||
if let Ok(value) = input.try(|input| flex_wrap::parse(context, input)) {
|
||||
wrap = Some(value);
|
||||
continue
|
||||
}
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
if direction.is_none() && wrap.is_none() {
|
||||
return Err(())
|
||||
}
|
||||
Ok(Longhands {
|
||||
flex_direction: direction,
|
||||
flex_wrap: wrap,
|
||||
})
|
||||
</%helpers:shorthand>
|
||||
|
||||
// https://drafts.csswg.org/css-flexbox/#flex-property
|
||||
<%helpers:shorthand name="flex" sub_properties="flex-grow flex-shrink flex-basis"
|
||||
experimental="True">
|
||||
use app_units::Au;
|
||||
use values::specified::{Number, Length, LengthOrPercentageOrAutoOrContent};
|
||||
|
||||
pub fn parse_flexibility(input: &mut Parser)
|
||||
-> Result<(Number, Option<Number>),()> {
|
||||
let grow = try!(Number::parse_non_negative(input));
|
||||
let shrink = input.try(Number::parse_non_negative).ok();
|
||||
Ok((grow, shrink))
|
||||
}
|
||||
|
||||
let mut grow = None;
|
||||
let mut shrink = None;
|
||||
let mut basis = None;
|
||||
|
||||
if input.try(|input| input.expect_ident_matching("none")).is_ok() {
|
||||
return Ok(Longhands {
|
||||
flex_grow: Some(Number(0.0)),
|
||||
flex_shrink: Some(Number(0.0)),
|
||||
flex_basis: Some(LengthOrPercentageOrAutoOrContent::Auto)
|
||||
})
|
||||
}
|
||||
loop {
|
||||
if grow.is_none() {
|
||||
if let Ok((flex_grow, flex_shrink)) = input.try(parse_flexibility) {
|
||||
grow = Some(flex_grow);
|
||||
shrink = flex_shrink;
|
||||
continue
|
||||
}
|
||||
}
|
||||
if basis.is_none() {
|
||||
if let Ok(value) = input.try(LengthOrPercentageOrAutoOrContent::parse) {
|
||||
basis = Some(value);
|
||||
continue
|
||||
}
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
if grow.is_none() && basis.is_none() {
|
||||
return Err(())
|
||||
}
|
||||
Ok(Longhands {
|
||||
flex_grow: grow.or(Some(Number(1.0))),
|
||||
flex_shrink: shrink.or(Some(Number(1.0))),
|
||||
flex_basis: basis.or(Some(LengthOrPercentageOrAutoOrContent::Length(Length::Absolute(Au(0)))))
|
||||
})
|
||||
</%helpers:shorthand>
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
prefs: ["layout.flex.enabled:true",
|
||||
"layout.flex-flow.enabled:true",
|
||||
"layout.flex-direction.enabled:true",
|
||||
"layout.flex-wrap.enabled:true",
|
||||
"layout.flex-grow.enabled:true",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
[css-flexbox-column-reverse.htm]
|
||||
type: reftest
|
||||
expected: FAIL
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-flow-column-nowrap.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex-flow: column nowrap]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-flow-column-reverse-nowrap.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex-flow: column-reverse nowrap]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-flow-column-reverse-wrap.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex-flow: column-reverse wrap]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-flow-column-reverse.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex-flow: column-reverse]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-flow-column-wrap-reverse.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex-flow: column wrap-reverse]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-flow-column-wrap.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex-flow: column wrap]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-flow-column.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex-flow: column]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-flow-row-reverse-nowrap.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex-flow: row-reverse nowrap]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex-flow: row-reverse wrap-reverse]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-flow-row-reverse-wrap.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex-flow: row-reverse wrap]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-flow-row-reverse.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex-flow: row-reverse]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-flow-row-wrap-reverse.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex-flow: row wrap-reverse]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-flow-row-wrap.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex-flow: row wrap]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-flow-wrap.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex-flow: wrap]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-shorthand-auto.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex: auto]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-shorthand-none.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex: auto]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-shorthand-number.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex: number]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[flexbox_computedstyle_flex-shorthand.htm]
|
||||
type: testharness
|
||||
[flexbox | computed style | flex: invalid]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -9,9 +9,6 @@
|
|||
[.flexbox 3]
|
||||
expected: FAIL
|
||||
|
||||
[.flexbox 4]
|
||||
expected: FAIL
|
||||
|
||||
[.flexbox 5]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue