Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Fix servo build.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2019-01-07 16:55:29 +01:00
parent 80651fde47
commit c7f30ad0df
16 changed files with 117 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/layout/flex.rs
View file

@ -29,7 +29,7 @@ use style::properties::ComputedValues;
use style::servo::restyle_damage::ServoRestyleDamage;
use style::values::computed::flex::FlexBasis;
use style::values::computed::{
LengthOrPercentage, LengthOrPercentageOrAuto, LengthOrPercentageOrNone,
LengthPercentage, LengthPercentageOrAuto, LengthPercentageOrNone,
};
use style::values::generics::flex::FlexBasis as GenericFlexBasis;
@ -46,16 +46,16 @@ impl AxisSize {
/// Generate a new available cross or main axis size from the specified size of the container,
/// containing block size, min constraint, and max constraint
pub fn new(
size: LengthOrPercentageOrAuto,
size: LengthPercentageOrAuto,
content_size: Option<Au>,
min: LengthOrPercentage,
max: LengthOrPercentageOrNone,
min: LengthPercentage,
max: LengthPercentageOrNone,
) -> AxisSize {
match size {
LengthOrPercentageOrAuto::Auto => {
LengthPercentageOrAuto::Auto => {
AxisSize::MinMax(SizeConstraint::new(content_size, min, max, None))
}
LengthOrPercentageOrAuto::LengthOrPercentage(ref lp) => {
LengthPercentageOrAuto::LengthPercentage(ref lp) => {
match lp.maybe_to_used_value(content_size) {
Some(length) => AxisSize::Definite(length),
None => AxisSize::Infinite,
@ -71,7 +71,7 @@ impl AxisSize {
/// is definite after flex size resolving.
fn from_flex_basis(
flex_basis: FlexBasis,
main_length: LengthOrPercentageOrAuto,
main_length: LengthPercentageOrAuto,
containing_length: Au,
) -> MaybeAuto {
let width = match flex_basis {
@ -80,7 +80,7 @@ fn from_flex_basis(
};
match width.0 {
LengthOrPercentageOrAuto::Auto => MaybeAuto::from_style(main_length, containing_length),
LengthPercentageOrAuto::Auto => MaybeAuto::from_style(main_length, containing_length),
other => MaybeAuto::from_style(other, containing_length),
}
}
@ -141,7 +141,7 @@ impl FlexItem {
let block = flow.as_mut_block();
match direction {
// TODO(stshine): the definition of min-{width, height} in style component
// should change to LengthOrPercentageOrAuto for automatic implied minimal size.
// should change to LengthPercentageOrAuto for automatic implied minimal size.
// https://drafts.csswg.org/css-flexbox-1/#min-size-auto
Direction::Inline => {
let basis = from_flex_basis(
@ -225,18 +225,18 @@ impl FlexItem {
let mut margin_count = 0;
match direction {
Direction::Inline => {
if margin.inline_start == LengthOrPercentageOrAuto::Auto {
if margin.inline_start == LengthPercentageOrAuto::Auto {
margin_count += 1;
}
if margin.inline_end == LengthOrPercentageOrAuto::Auto {
if margin.inline_end == LengthPercentageOrAuto::Auto {
margin_count += 1;
}
},
Direction::Block => {
if margin.block_start == LengthOrPercentageOrAuto::Auto {
if margin.block_start == LengthPercentageOrAuto::Auto {
margin_count += 1;
}
if margin.block_end == LengthOrPercentageOrAuto::Auto {
if margin.block_end == LengthPercentageOrAuto::Auto {
margin_count += 1;
}
},
@ -819,7 +819,7 @@ impl FlexFlow {
// cross size of item should equal to the line size if any auto margin exists.
// https://drafts.csswg.org/css-flexbox/#algo-cross-margins
if auto_margin_count > 0 {
if margin.block_start == LengthOrPercentageOrAuto::Auto {
if margin.block_start == LengthPercentageOrAuto::Auto {
margin_block_start = if free_space < Au(0) {
Au(0)
} else {
@ -833,7 +833,7 @@ impl FlexFlow {
let self_align = block.fragment.style().get_position().align_self;
if self_align == AlignSelf::Stretch &&
block.fragment.style().content_block_size() == LengthOrPercentageOrAuto::Auto
block.fragment.style().content_block_size() == LengthPercentageOrAuto::Auto
{
free_space = Au(0);
block.base.block_container_explicit_block_size = Some(line.cross_size);