From 5da880e2c24e5d8a60478d3dd0a008eac7111ed1 Mon Sep 17 00:00:00 2001 From: Pu Xingyu Date: Fri, 8 Jul 2016 10:20:40 +0800 Subject: [PATCH 01/10] Extend fields of FlexItem and add methods Extend fields of `FlexItem` struct with values that are necessary to resolve flexible lengths, and the 'order' property. Add other methods for size computing to make the code more modular. --- components/layout/flex.rs | 185 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 179 insertions(+), 6 deletions(-) diff --git a/components/layout/flex.rs b/components/layout/flex.rs index 62ad1073fe2..452c6875031 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -6,7 +6,7 @@ #![deny(unsafe_code)] -use app_units::Au; +use app_units::{Au, MAX_AU}; use block::BlockFlow; use context::LayoutContext; use display_list_builder::{DisplayListBuildState, FlexFlowDisplayListBuilding}; @@ -21,14 +21,17 @@ use gfx::display_list::StackingContext; use gfx_traits::StackingContextId; use layout_debug; use model::{IntrinsicISizes, MaybeAuto, MinMaxConstraint}; +use model::{specified, specified_or_none}; use script_layout_interface::restyle_damage::{REFLOW, REFLOW_OUT_OF_FLOW}; -use std::cmp::max; +use std::cmp::{max, min}; use std::sync::Arc; use style::computed_values::flex_direction; +use style::computed_values::{box_sizing, border_collapse}; use style::context::SharedStyleContext; use style::logical_geometry::LogicalSize; use style::properties::ServoComputedValues; -use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto, LengthOrPercentageOrNone}; +use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto}; +use style::values::computed::{LengthOrPercentageOrAutoOrContent, LengthOrPercentageOrNone}; /// The size of an axis. May be a specified size, a min/max /// constraint, or an unlimited size @@ -69,23 +72,193 @@ impl AxisSize { // The logical axises are inline and block, the flex axises are main and cross. // When the flex container has flex-direction: column or flex-direction: column-reverse, the main axis // should be block. Otherwise, it should be inline. -#[derive(Debug)] +#[derive(Debug, Clone, Copy)] enum Mode { Inline, Block } +/// This function accepts the flex-basis and the size property in main direction from style, +/// and the container size, then return the used value of flex basis. it can be used to help +/// determining the flex base size and to indicate whether the main size of the item +/// is definite after flex size resolving. +fn from_flex_basis(flex_basis: LengthOrPercentageOrAutoOrContent, + main_length: LengthOrPercentageOrAuto, + containing_length: Option) -> MaybeAuto { + match (flex_basis, containing_length) { + (LengthOrPercentageOrAutoOrContent::Length(length), _) => + MaybeAuto::Specified(length), + (LengthOrPercentageOrAutoOrContent::Percentage(percent), Some(size)) => + MaybeAuto::Specified(size.scale_by(percent)), + (LengthOrPercentageOrAutoOrContent::Percentage(_), None) => + MaybeAuto::Auto, + (LengthOrPercentageOrAutoOrContent::Calc(calc), Some(size)) => + MaybeAuto::Specified(calc.length() + size.scale_by(calc.percentage())), + (LengthOrPercentageOrAutoOrContent::Calc(_), None) => + MaybeAuto::Auto, + (LengthOrPercentageOrAutoOrContent::Content, _) => + MaybeAuto::Auto, + (LengthOrPercentageOrAutoOrContent::Auto, Some(size)) => + MaybeAuto::from_style(main_length, size), + (LengthOrPercentageOrAutoOrContent::Auto, None) => { + if let LengthOrPercentageOrAuto::Length(length) = main_length { + MaybeAuto::Specified(length) + } else { + MaybeAuto::Auto + } + } + } +} + +/// Represents a child in a flex container. Most fields here are used in +/// flex size resolving, and items are sorted by the 'order' property. #[derive(Debug)] struct FlexItem { + /// Main size of a flex item, used to store results of flexible length calcuation. + pub main_size: Au, + /// Used flex base size. + pub base_size: Au, + /// The minimal size in main direction. + pub min_size: Au, + /// The maximal main size. If this property is not actually set by style + /// It will be the largest size available for code reuse. + pub max_size: Au, + /// Reference to the actual flow. pub flow: FlowRef, + /// Style of the child flow, stored here to reduce overhead. + pub style: Arc, + /// The 'flex-grow' property of this item. + pub flex_grow: f32, + /// The 'flex-shrink' property of this item. + pub flex_shrink: f32, + /// The 'order' property of this item. + pub order: i32, + /// Whether the main size has met its constraint. + pub is_frozen: bool, + /// True if this flow has property 'visibility::collapse'. + pub is_strut: bool } impl FlexItem { - fn new(flow: FlowRef) -> FlexItem { + pub fn new(flow: FlowRef) -> FlexItem { + let style = flow.as_block().fragment.style.clone(); + let flex_grow = style.get_position().flex_grow; + let flex_shrink = style.get_position().flex_shrink; + let order = style.get_position().order; + // TODO(stshine): for item with visibility:collapse, set is_strut to true. + FlexItem { - flow: flow + main_size: Au(0), + base_size: Au(0), + min_size: Au(0), + max_size: MAX_AU, + flow: flow, + style: style, + flex_grow: flex_grow, + flex_shrink: flex_shrink, + order: order, + is_frozen: false, + is_strut: false } } + + /// Initialize the used flex base size, minimal main size and maximal main size. + /// For block mode container this method should be called in assign_block_size() + /// pass so that the item has already been layouted. + pub fn init_sizes(&mut self, containing_length: Au, mode: Mode) { + let block = flow_ref::deref_mut(&mut self.flow).as_mut_block(); + match mode { + // TODO(stshine): the definition of min-{width, height} in style component + // should change to LengthOrPercentageOrAuto for automatic implied minimal size. + // https://drafts.csswg.org/css-flexbox-1/#min-size-auto + Mode::Inline => { + let basis = from_flex_basis(self.style.get_position().flex_basis, + self.style.content_inline_size(), + Some(containing_length)); + + // These methods compute auto margins to zero length, which is exactly what we want. + block.fragment.compute_border_and_padding(containing_length, + border_collapse::T::separate); + block.fragment.compute_inline_direction_margins(containing_length); + block.fragment.compute_block_direction_margins(containing_length); + + let adjustment = match self.style.get_position().box_sizing { + box_sizing::T::content_box => Au(0), + box_sizing::T::border_box => + block.fragment.border_padding.inline_start_end() + }; + let content_size = block.base.intrinsic_inline_sizes.preferred_inline_size + - block.fragment.surrounding_intrinsic_inline_size() + adjustment; + self.base_size = basis.specified_or_default(content_size); + self.max_size = specified_or_none(self.style.max_inline_size(), containing_length) + .unwrap_or(MAX_AU); + self.min_size = specified(self.style.min_inline_size(), containing_length); + }, + Mode::Block => { + let basis = from_flex_basis(self.style.get_position().flex_basis, + self.style.content_block_size(), + Some(containing_length)); + let content_size = match self.style.get_position().box_sizing { + box_sizing::T::border_box => block.fragment.border_box.size.block, + box_sizing::T::content_box => block.fragment.border_box.size.block + - block.fragment.border_padding.block_start_end(), + }; + self.base_size = basis.specified_or_default(content_size); + self.max_size = specified_or_none(self.style.max_block_size(), containing_length) + .unwrap_or(MAX_AU); + self.min_size = specified(self.style.min_block_size(), containing_length); + } + } + } + + /// Return the outer main size of the item, including paddings and margins, + /// clamped by max and min size. + pub fn outer_main_size(&self, mode: Mode) -> Au { + let ref fragment = self.flow.as_block().fragment; + let adjustment = match mode { + Mode::Inline => { + match self.style.get_position().box_sizing { + box_sizing::T::content_box => + fragment.border_padding.inline_start_end() + fragment.margin.inline_start_end(), + box_sizing::T::border_box => + fragment.margin.inline_start_end() + } + }, + Mode::Block => { + match self.style.get_position().box_sizing { + box_sizing::T::content_box => + fragment.border_padding.block_start_end() + fragment.margin.block_start_end(), + box_sizing::T::border_box => + fragment.margin.block_start_end() + } + } + }; + max(self.min_size, min(self.base_size, self.max_size)) + adjustment + } + + pub fn auto_margin_num(&self, mode: Mode) -> i32 { + let margin = self.style.logical_margin(); + let mut margin_count = 0; + match mode { + Mode::Inline => { + if margin.inline_start == LengthOrPercentageOrAuto::Auto { + margin_count += 1; + } + if margin.inline_end == LengthOrPercentageOrAuto::Auto { + margin_count += 1; + } + } + Mode::Block => { + if margin.block_start == LengthOrPercentageOrAuto::Auto { + margin_count += 1; + } + if margin.block_end == LengthOrPercentageOrAuto::Auto { + margin_count += 1; + } + } + } + margin_count + } } /// A block with the CSS `display` property equal to `flex`. From bf5805f2a614ff03a3e11382a273676830868a7b Mon Sep 17 00:00:00 2001 From: Pu Xingyu Date: Wed, 20 Jul 2016 16:11:48 +0800 Subject: [PATCH 02/10] Add flags 'is_wrappable' and 'cross_reverse' These 'is_wrappable' flag can be used to determine if a flex flow can be multi-line. The 'is_reverse' flag is replaced by 'main_reverse' and 'cross_reverse' since flex flow can go reverse individually in main and cross direction. --- components/layout/flex.rs | 49 +++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/components/layout/flex.rs b/components/layout/flex.rs index 452c6875031..da76775be93 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -27,6 +27,7 @@ use std::cmp::{max, min}; use std::sync::Arc; use style::computed_values::flex_direction; use style::computed_values::{box_sizing, border_collapse}; +use style::computed_values::flex_wrap; use style::context::SharedStyleContext; use style::logical_geometry::LogicalSize; use style::properties::ServoComputedValues; @@ -276,19 +277,41 @@ pub struct FlexFlow { /// List of flex-items that belong to this flex-container items: Vec, /// True if the flex-direction is *-reversed - is_reverse: bool + main_reverse: bool, + /// True if this flex container can be multiline. + is_wrappable: bool, + /// True if the cross direction is reversed. + cross_reverse: bool } impl FlexFlow { pub fn from_fragment(fragment: Fragment, flotation: Option) -> FlexFlow { - let (main_mode, is_reverse) = match fragment.style.get_position().flex_direction { - flex_direction::T::row => (Mode::Inline, false), - flex_direction::T::row_reverse => (Mode::Inline, true), - flex_direction::T::column => (Mode::Block, false), - flex_direction::T::column_reverse => (Mode::Block, true), - }; + let main_mode; + let main_reverse; + let is_wrappable; + let cross_reverse; + { + let style = fragment.style(); + let (mode, reverse) = match style.get_position().flex_direction { + flex_direction::T::row => (Mode::Inline, false), + flex_direction::T::row_reverse => (Mode::Inline, true), + flex_direction::T::column => (Mode::Block, false), + flex_direction::T::column_reverse => (Mode::Block, true), + }; + main_mode = mode; + main_reverse = + reverse == style.writing_mode.is_bidi_ltr(); + let (wrappable, reverse) = match fragment.style.get_position().flex_wrap { + flex_wrap::T::nowrap => (false, false), + flex_wrap::T::wrap => (true, false), + flex_wrap::T::wrap_reverse => (true, true), + }; + is_wrappable = wrappable; + // TODO(stshine): Handle vertical writing mode. + cross_reverse = reverse; + } FlexFlow { block_flow: BlockFlow::from_fragment(fragment, flotation), @@ -296,7 +319,9 @@ impl FlexFlow { available_main_size: AxisSize::Infinite, available_cross_size: AxisSize::Infinite, items: Vec::new(), - is_reverse: is_reverse + main_reverse: main_reverse, + is_wrappable: is_wrappable, + cross_reverse: cross_reverse } } @@ -430,7 +455,7 @@ impl FlexFlow { self.block_flow.base.position.size.inline = inline_size; let block_container_explicit_block_size = self.block_flow.base.block_container_explicit_block_size; - let mut inline_child_start = if !self.is_reverse { + let mut inline_child_start = if !self.main_reverse { inline_start_content_edge } else { self.block_flow.fragment.border_box.size.inline @@ -441,7 +466,7 @@ impl FlexFlow { base.block_container_inline_size = even_content_inline_size; base.block_container_writing_mode = container_mode; base.block_container_explicit_block_size = block_container_explicit_block_size; - if !self.is_reverse { + if !self.main_reverse { base.position.start.i = inline_child_start; inline_child_start = inline_child_start + even_content_inline_size; } else { @@ -453,14 +478,14 @@ impl FlexFlow { // TODO(zentner): This function should actually flex elements! fn block_mode_assign_block_size<'a>(&mut self, layout_context: &'a LayoutContext<'a>) { - let mut cur_b = if !self.is_reverse { + let mut cur_b = if !self.main_reverse { self.block_flow.fragment.border_padding.block_start } else { self.block_flow.fragment.border_box.size.block }; for kid in &mut self.items { let base = flow::mut_base(flow_ref::deref_mut(&mut kid.flow)); - if !self.is_reverse { + if !self.main_reverse { base.position.start.b = cur_b; cur_b = cur_b + base.position.size.block; } else { From 87a041d4167e8af4fc19750edadfeb2bed05a1e8 Mon Sep 17 00:00:00 2001 From: Pu Xingyu Date: Wed, 20 Jul 2016 16:41:17 +0800 Subject: [PATCH 03/10] Add FlexLine and its method for flex resolving Add the 'FlexLine' struct to represent a line in flex container, and the 'flex_resolve()' method for flex lengths resolving. --- components/layout/flex.rs | 96 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/components/layout/flex.rs b/components/layout/flex.rs index da76775be93..f185f586536 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -24,6 +24,7 @@ use model::{IntrinsicISizes, MaybeAuto, MinMaxConstraint}; use model::{specified, specified_or_none}; use script_layout_interface::restyle_damage::{REFLOW, REFLOW_OUT_OF_FLOW}; use std::cmp::{max, min}; +use std::ops::Range; use std::sync::Arc; use style::computed_values::flex_direction; use style::computed_values::{box_sizing, border_collapse}; @@ -262,6 +263,98 @@ impl FlexItem { } } +/// A line in a flex container. +// TODO(stshine): More fields are required to handle collapsed items and baseline alignment. +#[derive(Debug)] +struct FlexLine { + /// Range of items belong to this line in 'self.items'. + pub range: Range, + /// Remainig free space of this line, items will grow or shrink based on it being positive or negative. + pub free_space: Au, + /// the number of auto margins of items. + pub auto_margin_count: i32, + /// Line size in the block direction. + pub cross_size: Au, +} + +impl FlexLine { + pub fn new(range: Range, free_space: Au, auto_margin_count: i32) -> FlexLine { + FlexLine { + range: range, + auto_margin_count: auto_margin_count, + free_space: free_space, + cross_size: Au(0) + } + } + + /// This method implements the flexible lengths resolving algorithm. + /// The 'collapse' parameter is used to indicate whether items with 'visibility: hidden' + /// is included in length resolving. The result main size is stored in 'item.main_size'. + /// https://drafts.csswg.org/css-flexbox/#resolve-flexible-lengths + pub fn flex_resolve(&mut self, items: &mut [FlexItem], collapse: bool) { + let mut total_grow = 0.0; + let mut total_shrink = 0.0; + let mut total_scaled = 0.0; + let mut active_count = 0; + // Iterate through items, collect total factors and freeze those that have already met + // their constraints or won't grow/shrink in corresponding scenario. + // https://drafts.csswg.org/css-flexbox/#resolve-flexible-lengths + for item in items.iter_mut().filter(|i| !(i.is_strut && collapse)) { + item.main_size = max(item.min_size, min(item.base_size, item.max_size)); + if item.main_size != item.base_size + || (self.free_space > Au(0) && item.flex_grow == 0.0) + || (self.free_space < Au(0) && item.flex_shrink == 0.0) { + item.is_frozen = true; + } else { + item.is_frozen = false; + total_grow += item.flex_grow; + total_shrink += item.flex_shrink; + // The scaled factor is used to calculate flex shrink + total_scaled += item.flex_shrink * item.base_size.0 as f32; + active_count += 1; + } + } + + let initial_free_space = self.free_space; + let mut total_variation = Au(1); + // If there is no remaining free space or all items are frozen, stop loop. + while total_variation != Au(0) && self.free_space != Au(0) && active_count > 0 { + self.free_space = + // https://drafts.csswg.org/css-flexbox/#remaining-free-space + if self.free_space > Au(0) { + min(initial_free_space.scale_by(total_grow), self.free_space) + } else { + max(initial_free_space.scale_by(total_shrink), self.free_space) + }; + + total_variation = Au(0); + for item in items.iter_mut().filter(|i| !i.is_frozen).filter(|i| !(i.is_strut && collapse)) { + // Use this and the 'abs()' below to make the code work in both grow and shrink scenarios. + let (factor, end_size) = if self.free_space > Au(0) { + (item.flex_grow / total_grow, item.max_size) + } else { + (item.flex_shrink * item.base_size.0 as f32 / total_scaled, item.min_size) + }; + let variation = self.free_space.scale_by(factor); + if variation.0.abs() > (end_size - item.main_size).0.abs() { + // Use constraint as the target main size, and freeze item. + total_variation += end_size - item.main_size; + item.main_size = end_size; + item.is_frozen = true; + active_count -= 1; + total_shrink -= item.flex_shrink; + total_grow -= item.flex_grow; + total_scaled -= item.flex_shrink * item.base_size.0 as f32; + } else { + total_variation += variation; + item.main_size += variation; + } + } + self.free_space -= total_variation; + } + } +} + /// A block with the CSS `display` property equal to `flex`. #[derive(Debug)] pub struct FlexFlow { @@ -274,6 +367,8 @@ pub struct FlexFlow { available_main_size: AxisSize, /// The available cross axis size available_cross_size: AxisSize, + /// List of flex lines in the container. + lines: Vec, /// List of flex-items that belong to this flex-container items: Vec, /// True if the flex-direction is *-reversed @@ -318,6 +413,7 @@ impl FlexFlow { main_mode: main_mode, available_main_size: AxisSize::Infinite, available_cross_size: AxisSize::Infinite, + lines: Vec::new(), items: Vec::new(), main_reverse: main_reverse, is_wrappable: is_wrappable, From 196d19a311f53a8828731ceacb258d7d91ed96cc Mon Sep 17 00:00:00 2001 From: Pu Xingyu Date: Wed, 20 Jul 2016 16:49:07 +0800 Subject: [PATCH 04/10] Add 'get_flex_line()' method to flex flow The method returns 'Option', can be used to obtain a line in flex container. --- components/layout/flex.rs | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/components/layout/flex.rs b/components/layout/flex.rs index f185f586536..15685e7b69d 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -421,6 +421,42 @@ impl FlexFlow { } } + /// Returns a line start after the last item that is already in a line. + /// Note that when the container main size is infinite(i.e. A column flexbox with auto height), + /// we do not need to do flex resolving and this can be considered as a fast-path, so the + /// 'container_size' param does not need to be 'None'. A line has to contain at least one item; + /// (expect this) if the container can be multi-line the sum of outer main size of items should + /// be less than the container size; a line should be filled by items as much as possible. + /// After been collected in a line a item should have its main sizes initialized. + fn get_flex_line(&mut self, container_size: Au) -> Option { + let start = if self.lines.len() == 0 { + 0 + } else { + self.lines[self.lines.len()-1].range.end + }; + if start == self.items.len() { + return None; + } + let mut end = start; + let mut total_line_size = Au(0); + let mut margin_count = 0; + + let items = &mut self.items[start..]; + for mut item in items.iter_mut() { + item.init_sizes(container_size, self.main_mode); + let outer_main_size = item.outer_main_size(self.main_mode); + if total_line_size + outer_main_size > container_size && end != start && self.is_wrappable { + break; + } + margin_count += item.auto_margin_num(self.main_mode); + total_line_size += outer_main_size; + end += 1; + } + + let line = FlexLine::new(start..end, container_size - total_line_size, margin_count); + Some(line) + } + // TODO(zentner): This function should use flex-basis. // Currently, this is the core of BlockFlow::bubble_inline_sizes() with all float logic // stripped out, and max replaced with union_nonbreaking_inline. From 05cf52cb0b2e29ff886c9835e631fc89d541e7f5 Mon Sep 17 00:00:00 2001 From: Pu Xingyu Date: Wed, 20 Jul 2016 16:55:44 +0800 Subject: [PATCH 05/10] Filter abs-pos children and sort by 'order' field As the flexbox spec change in May 2016, the absolutely positioned children painting order no longer follow the `order` property, thus we can simply filter them out. Also sort items by the order field of 'FlexItem', no longer do two vtable lookups in each compare. --- components/layout/flex.rs | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/components/layout/flex.rs b/components/layout/flex.rs index 15685e7b69d..8ec46bf2bd7 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -712,19 +712,14 @@ impl Flow for FlexFlow { // Flexbox Section 9.0: Generate anonymous flex items: // This part was handled in the flow constructor. - // Flexbox Section 9.1: Re-order the flex items (and any absolutely positioned flex - // container children) according to their order. - - let mut items = self.block_flow.base.children.iter_flow_ref_mut().map(|flow| { - FlexItem::new(flow.clone()) - }).collect::>(); - - items.sort_by(|item1, item2| { - item1.flow.as_block().fragment.style.get_position().order.cmp( - &item2.flow.as_block().fragment.style.get_position().order - ) - }); + // Flexbox Section 9.1: Re-order flex items according to their order. + // FIXME(stshine): This should be done during flow construction. + let mut items = self.block_flow.base.children.iter_flow_ref_mut() + .filter(|flow| !flow.as_block().base.flags.contains(IS_ABSOLUTELY_POSITIONED)) + .map(|flow| FlexItem::new(flow.clone())) + .collect::>(); + items.sort_by_key(|item| item.order); self.items = items; match self.main_mode { From bc8d22a5e786618b7821fadbe701ad0dd0850958 Mon Sep 17 00:00:00 2001 From: Pu Xingyu Date: Wed, 20 Jul 2016 22:42:02 +0800 Subject: [PATCH 06/10] Make the width of block customizable by its parent Add a 'IS_FLEX' flag to bitflags of block flow, and when it is set, the block will use the inline size and margins set by its parent. --- components/layout/block.rs | 46 +++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/components/layout/block.rs b/components/layout/block.rs index 4f6bf28004b..2b493d9ee16 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -487,6 +487,7 @@ pub enum BlockType { FloatNonReplaced, InlineBlockReplaced, InlineBlockNonReplaced, + FlexItem, } #[derive(Clone, PartialEq)] @@ -529,7 +530,9 @@ pub struct BlockFlow { bitflags! { flags BlockFlowFlags: u8 { #[doc = "If this is set, then this block flow is the root flow."] - const IS_ROOT = 0x01, + const IS_ROOT = 0b0000_0001, + #[doc = "Whether this block flow is a child of a flex container."] + const IS_FLEX = 0b0001_0000, } } @@ -566,6 +569,8 @@ impl BlockFlow { } else { BlockType::AbsoluteNonReplaced } + } else if self.is_flex() { + BlockType::FlexItem } else if self.base.flags.is_float() { if self.is_replaced_content() { BlockType::FloatReplaced @@ -641,6 +646,12 @@ impl BlockFlow { shared_context, containing_block_inline_size); } + BlockType::FlexItem => { + let inline_size_computer = FlexItem; + inline_size_computer.compute_used_inline_size(self, + shared_context, + containing_block_inline_size); + } } } @@ -1681,6 +1692,14 @@ impl BlockFlow { let padding = self.fragment.style.logical_padding(); padding.block_start.is_definitely_zero() && padding.block_end.is_definitely_zero() } + + pub fn mark_as_flex(&mut self) { + self.flags.insert(IS_FLEX) + } + + pub fn is_flex(&self) -> bool { + self.flags.contains(IS_FLEX) + } } impl Flow for BlockFlow { @@ -2567,6 +2586,7 @@ pub struct FloatNonReplaced; pub struct FloatReplaced; pub struct InlineBlockNonReplaced; pub struct InlineBlockReplaced; +pub struct FlexItem; impl ISizeAndMarginsComputer for AbsoluteNonReplaced { /// Solve the horizontal constraint equation for absolute non-replaced elements. @@ -3057,6 +3077,30 @@ impl ISizeAndMarginsComputer for InlineBlockReplaced { } } +impl ISizeAndMarginsComputer for FlexItem { + // Replace the default method directly to prevent recalculating and setting margins again + // which has already been set by its parent. + fn compute_used_inline_size(&self, + block: &mut BlockFlow, + shared_context: &SharedStyleContext, + parent_flow_inline_size: Au) { + let container_block_size = block.explicit_block_containing_size(shared_context); + block.fragment.assign_replaced_inline_size_if_necessary(parent_flow_inline_size, + container_block_size); + } + + // Literally do nothing. + fn solve_inline_size_constraints(&self, + block: &mut BlockFlow, + _: &ISizeConstraintInput) + -> ISizeConstraintSolution { + let fragment = block.fragment(); + ISizeConstraintSolution::new(fragment.border_box.size.inline, + fragment.margin.inline_start, + fragment.margin.inline_end) + } +} + /// A stacking context, a pseudo-stacking context, or a non-stacking context. #[derive(Copy, Clone, PartialEq)] pub enum BlockStackingContextType { From a70d2bbed8ee9e6293576a173d143fdf3b50f0f9 Mon Sep 17 00:00:00 2001 From: Pu Xingyu Date: Sat, 23 Jul 2016 01:07:22 +0800 Subject: [PATCH 07/10] Flex elements in a row flex container Iterate over the items, create lines from them, resolve flex lengths against them, set their inline size and margin lengths, and align them according to 'justify-content', 'align-content' and 'align-self'. --- components/layout/block.rs | 2 +- components/layout/flex.rs | 280 ++++++++++++++++++++++++++++--------- 2 files changed, 214 insertions(+), 68 deletions(-) diff --git a/components/layout/block.rs b/components/layout/block.rs index 2b493d9ee16..f1501411fe1 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -1159,7 +1159,7 @@ impl BlockFlow { } } - fn explicit_block_size(&self, containing_block_size: Option) -> Option { + pub fn explicit_block_size(&self, containing_block_size: Option) -> Option { let content_block_size = self.fragment.style().content_block_size(); match (content_block_size, containing_block_size) { diff --git a/components/layout/flex.rs b/components/layout/flex.rs index 8ec46bf2bd7..3ae058ad584 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -26,10 +26,9 @@ use script_layout_interface::restyle_damage::{REFLOW, REFLOW_OUT_OF_FLOW}; use std::cmp::{max, min}; use std::ops::Range; use std::sync::Arc; -use style::computed_values::flex_direction; +use style::computed_values::{align_content, align_self, flex_direction, flex_wrap, justify_content}; use style::computed_values::{box_sizing, border_collapse}; -use style::computed_values::flex_wrap; -use style::context::SharedStyleContext; +use style::context::{SharedStyleContext, StyleContext}; use style::logical_geometry::LogicalSize; use style::properties::ServoComputedValues; use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto}; @@ -556,9 +555,6 @@ impl FlexFlow { } } - // TODO(zentner): This function should actually flex elements! - // Currently, this is the core of InlineFlow::propagate_assigned_inline_size_to_children() with - // fragment logic stripped out. fn inline_mode_assign_inline_sizes(&mut self, _shared_context: &SharedStyleContext, inline_start_content_edge: Au, @@ -581,30 +577,106 @@ impl FlexFlow { AxisSize::Infinite => content_inline_size, }; - let even_content_inline_size = inline_size / child_count; - let container_mode = self.block_flow.base.block_container_writing_mode; self.block_flow.base.position.size.inline = inline_size; - let block_container_explicit_block_size = self.block_flow.base.block_container_explicit_block_size; - let mut inline_child_start = if !self.main_reverse { - inline_start_content_edge - } else { - self.block_flow.fragment.border_box.size.inline + // Calculate non-auto block size to pass to children. + let box_border = match self.block_flow.fragment.style().get_position().box_sizing { + box_sizing::T::border_box => self.block_flow.fragment.border_padding.block_start_end(), + box_sizing::T::content_box => Au(0), }; - for kid in &mut self.items { - let base = flow::mut_base(flow_ref::deref_mut(&mut kid.flow)); + let parent_container_size = self.block_flow.explicit_block_containing_size(_shared_context); + // https://drafts.csswg.org/css-ui-3/#box-sizing + let explicit_content_size = self + .block_flow + .explicit_block_size(parent_container_size) + .map(|x| if x < box_border { Au(0) } else { x - box_border }); + let containing_block_text_align = + self.block_flow.fragment.style().get_inheritedtext().text_align; - base.block_container_inline_size = even_content_inline_size; - base.block_container_writing_mode = container_mode; - base.block_container_explicit_block_size = block_container_explicit_block_size; - if !self.main_reverse { - base.position.start.i = inline_child_start; - inline_child_start = inline_child_start + even_content_inline_size; + while let Some(mut line) = self.get_flex_line(inline_size) { + let items = &mut self.items[line.range.clone()]; + line.flex_resolve(items, false); + // TODO(stshine): if this flex line contain children that have + // property visibility:hidden, exclude them and resolve again. + + let item_count = items.len() as i32; + let mut cur_i = inline_start_content_edge; + let item_interval = if line.free_space >= Au(0) && line.auto_margin_count == 0 { + match self.block_flow.fragment.style().get_position().justify_content { + justify_content::T::space_between => { + if item_count == 1 { + Au(0) + } else { + line.free_space / (item_count - 1) + } + }, + justify_content::T::space_around => { + line.free_space / item_count + }, + _ => Au(0), + } } else { - base.position.start.i = inline_child_start - base.intrinsic_inline_sizes.preferred_inline_size; - inline_child_start = inline_child_start - even_content_inline_size; + Au(0) }; + + match self.block_flow.fragment.style().get_position().justify_content { + // Overflow equally in both end. + justify_content::T::center | justify_content::T::space_around => { + cur_i += (line.free_space - item_interval * (item_count - 1)) / 2; + } + justify_content::T::flex_end => { + cur_i += line.free_space; + } + _ => {} + } + + for item in items.iter_mut() { + let mut block = flow_ref::deref_mut(&mut item.flow).as_mut_block(); + + block.base.block_container_writing_mode = container_mode; + block.base.block_container_inline_size = inline_size; + block.base.block_container_explicit_block_size = explicit_content_size; + // Per CSS 2.1 ยง 16.3.1, text alignment propagates to all children in flow. + // + // TODO(#2265, pcwalton): Do this in the cascade instead. + block.base.flags.set_text_align(containing_block_text_align); + // FIXME(stshine): should this be done during construction? + block.mark_as_flex(); + + let margin = block.fragment.style().logical_margin(); + let auto_len = + if line.auto_margin_count == 0 || line.free_space <= Au(0) { + Au(0) + } else { + line.free_space / line.auto_margin_count + }; + let margin_inline_start = MaybeAuto::from_style(margin.inline_start, inline_size) + .specified_or_default(auto_len); + let margin_inline_end = MaybeAuto::from_style(margin.inline_end, inline_size) + .specified_or_default(auto_len); + let item_inline_size = item.main_size + + match block.fragment.style().get_position().box_sizing { + box_sizing::T::border_box => Au(0), + box_sizing::T::content_box => block.fragment.border_padding.inline_start_end(), + }; + let item_outer_size = item_inline_size + block.fragment.margin.inline_start_end(); + + block.fragment.margin.inline_start = margin_inline_start; + block.fragment.margin.inline_end = margin_inline_end; + block.fragment.border_box.start.i = margin_inline_start; + block.fragment.border_box.size.inline = item_inline_size; + if !self.main_reverse { + block.base.position.start.i = cur_i; + } else { + block.base.position.start.i = + inline_start_content_edge *2 + content_inline_size + - cur_i - item_outer_size; + }; + block.base.position.size.inline = item_outer_size; + cur_i += item_outer_size + item_interval; + } + self.lines.push(line); } } @@ -628,63 +700,137 @@ impl FlexFlow { self.block_flow.assign_block_size(layout_context) } - // TODO(zentner): This function should actually flex elements! - // Currently, this is the core of TableRowFlow::assign_block_size() with - // float related logic stripped out. fn inline_mode_assign_block_size<'a>(&mut self, layout_context: &'a LayoutContext<'a>) { let _scope = layout_debug_scope!("flex::inline_mode_assign_block_size"); - let mut max_block_size = Au(0); - let thread_id = self.block_flow.base.thread_id; - for kid in self.block_flow.base.child_iter_mut() { - kid.assign_block_size_for_inorder_child_if_necessary(layout_context, thread_id); + let line_count = self.lines.len() as i32; + let line_align = self.block_flow.fragment.style().get_position().align_content; + let mut cur_b = self.block_flow.fragment.border_padding.block_start; + let mut total_cross_size = Au(0); + let mut line_interval = Au(0); - { - let child_fragment = &mut kid.as_mut_block().fragment; - // TODO: Percentage block-size - let child_specified_block_size = - MaybeAuto::from_style(child_fragment.style().content_block_size(), - Au(0)).specified_or_zero(); - max_block_size = - max(max_block_size, - child_specified_block_size + - child_fragment.border_padding.block_start_end()); + for line in self.lines.iter_mut() { + for item in &self.items[line.range.clone()] { + let ref fragment = item.flow.as_block().fragment; + line.cross_size = max(line.cross_size, + fragment.border_box.size.block + fragment.margin.block_start_end()); } - let child_node = flow::mut_base(kid); - child_node.position.start.b = Au(0); - max_block_size = max(max_block_size, child_node.position.size.block); + total_cross_size += line.cross_size; } - let mut block_size = max_block_size; - // TODO: Percentage block-size - - block_size = match MaybeAuto::from_style(self.block_flow - .fragment - .style() - .content_block_size(), - Au(0)) { - MaybeAuto::Auto => block_size, - MaybeAuto::Specified(value) => max(value, block_size), + let box_border = match self.block_flow.fragment.style().get_position().box_sizing { + box_sizing::T::border_box => self.block_flow.fragment.border_padding.block_start_end(), + box_sizing::T::content_box => Au(0), }; + let parent_container_size = + self.block_flow.explicit_block_containing_size(layout_context.shared_context()); + // https://drafts.csswg.org/css-ui-3/#box-sizing + let explicit_content_size = self + .block_flow + .explicit_block_size(parent_container_size) + .map(|x| if x < box_border { Au(0) } else { x - box_border }); - // Assign the block-size of own fragment - let mut position = self.block_flow.fragment.border_box; - position.size.block = block_size; - self.block_flow.fragment.border_box = position; - self.block_flow.base.position.size.block = block_size; + if let Some(container_block_size) = explicit_content_size { + let free_space = container_block_size - total_cross_size; + total_cross_size = container_block_size; - // Assign the block-size of kid fragments, which is the same value as own block-size. - for kid in self.block_flow.base.child_iter_mut() { - { - let kid_fragment = &mut kid.as_mut_block().fragment; - let mut position = kid_fragment.border_box; - position.size.block = block_size; - kid_fragment.border_box = position; + if line_align == align_content::T::stretch && free_space > Au(0) { + for line in self.lines.iter_mut() { + line.cross_size += free_space / line_count; + } } - // Assign the child's block size. - flow::mut_base(kid).position.size.block = block_size + line_interval = match line_align { + align_content::T::space_between => { + if line_count == 1 { + Au(0) + } else { + free_space /(line_count - 1) + } + }, + align_content::T::space_around => { + free_space / line_count + }, + _ => Au(0), + }; + + match line_align { + align_content::T::center | align_content::T::space_around => { + cur_b += (free_space - line_interval * (line_count - 1)) / 2; + } + align_content::T::flex_end => { + cur_b += free_space; + } + _ => {} + } } + + for line in &self.lines { + for mut item in self.items[line.range.clone()].iter_mut() { + let auto_margin_count = item.auto_margin_num(Mode::Block); + let mut block = flow_ref::deref_mut(&mut item.flow).as_mut_block(); + let margin = block.fragment.style().logical_margin(); + + let mut margin_block_start = block.fragment.margin.block_start; + let mut margin_block_end = block.fragment.margin.block_end; + let mut free_space = line.cross_size - block.base.position.size.block + - block.fragment.margin.block_start_end(); + + // The spec is a little vague here, but if I understand it correctly, the outer + // 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 { + margin_block_start = if free_space < Au(0) { + Au(0) + } else { + free_space / auto_margin_count + }; + } + margin_block_end = line.cross_size - margin_block_start - block.base.position.size.block; + free_space = Au(0); + } + + let self_align = block.fragment.style().get_position().align_self; + if self_align == align_self::T::stretch && + block.fragment.style().content_block_size() == LengthOrPercentageOrAuto::Auto { + free_space = Au(0); + block.base.block_container_explicit_block_size = Some(line.cross_size); + block.base.position.size.block = + line.cross_size - margin_block_start - margin_block_end; + block.fragment.border_box.size.block = block.base.position.size.block; + // FIXME(stshine): item with 'align-self: stretch' and auto cross size should act + // as if it has a fixed cross size, all child blocks should resolve against it. + // block.assign_block_size(layout_context); + } + block.base.position.start.b = margin_block_start + + if !self.cross_reverse { + cur_b + } else { + self.block_flow.fragment.border_padding.block_start *2 + + total_cross_size - cur_b - line.cross_size + }; + // TODO(stshine): support baseline alignment. + if free_space != Au(0) { + let flex_cross = match self_align { + align_self::T::flex_end => free_space, + align_self::T::center => free_space / 2, + _ => Au(0), + }; + block.base.position.start.b += + if !self.cross_reverse { + flex_cross + } else { + free_space - flex_cross + }; + } + } + cur_b += line_interval + line.cross_size; + } + let total_block_size = total_cross_size + self.block_flow.fragment.border_padding.block_start_end(); + self.block_flow.fragment.border_box.size.block = total_block_size; + self.block_flow.base.position.size.block = total_block_size; + } } From 7df5974456066e2acabe9991f1da1ab862ca2e46 Mon Sep 17 00:00:00 2001 From: Pu Xingyu Date: Sun, 24 Jul 2016 14:58:02 +0800 Subject: [PATCH 08/10] Rename enum 'Mode' to 'Direction' Rename the 'Mode' enum to 'Direction' and move it to 'model.rs', thus it can be used to indicate logical direction. --- components/layout/flex.rs | 64 ++++++++++++++++---------------------- components/layout/model.rs | 7 +++++ 2 files changed, 34 insertions(+), 37 deletions(-) diff --git a/components/layout/flex.rs b/components/layout/flex.rs index 3ae058ad584..23d662edd2a 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -20,7 +20,7 @@ use fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; use gfx::display_list::StackingContext; use gfx_traits::StackingContextId; use layout_debug; -use model::{IntrinsicISizes, MaybeAuto, MinMaxConstraint}; +use model::{Direction, IntrinsicISizes, MaybeAuto, MinMaxConstraint}; use model::{specified, specified_or_none}; use script_layout_interface::restyle_damage::{REFLOW, REFLOW_OUT_OF_FLOW}; use std::cmp::{max, min}; @@ -69,16 +69,6 @@ impl AxisSize { } } -// A mode describes which logical axis a flex axis is parallel with. -// The logical axises are inline and block, the flex axises are main and cross. -// When the flex container has flex-direction: column or flex-direction: column-reverse, the main axis -// should be block. Otherwise, it should be inline. -#[derive(Debug, Clone, Copy)] -enum Mode { - Inline, - Block -} - /// This function accepts the flex-basis and the size property in main direction from style, /// and the container size, then return the used value of flex basis. it can be used to help /// determining the flex base size and to indicate whether the main size of the item @@ -166,13 +156,13 @@ impl FlexItem { /// Initialize the used flex base size, minimal main size and maximal main size. /// For block mode container this method should be called in assign_block_size() /// pass so that the item has already been layouted. - pub fn init_sizes(&mut self, containing_length: Au, mode: Mode) { + pub fn init_sizes(&mut self, containing_length: Au, direction: Direction) { let block = flow_ref::deref_mut(&mut self.flow).as_mut_block(); - match mode { + match direction { // TODO(stshine): the definition of min-{width, height} in style component // should change to LengthOrPercentageOrAuto for automatic implied minimal size. // https://drafts.csswg.org/css-flexbox-1/#min-size-auto - Mode::Inline => { + Direction::Inline => { let basis = from_flex_basis(self.style.get_position().flex_basis, self.style.content_inline_size(), Some(containing_length)); @@ -194,8 +184,8 @@ impl FlexItem { self.max_size = specified_or_none(self.style.max_inline_size(), containing_length) .unwrap_or(MAX_AU); self.min_size = specified(self.style.min_inline_size(), containing_length); - }, - Mode::Block => { + } + Direction::Block => { let basis = from_flex_basis(self.style.get_position().flex_basis, self.style.content_block_size(), Some(containing_length)); @@ -214,18 +204,18 @@ impl FlexItem { /// Return the outer main size of the item, including paddings and margins, /// clamped by max and min size. - pub fn outer_main_size(&self, mode: Mode) -> Au { + pub fn outer_main_size(&self, direction: Direction) -> Au { let ref fragment = self.flow.as_block().fragment; - let adjustment = match mode { - Mode::Inline => { + let adjustment = match direction { + Direction::Inline => { match self.style.get_position().box_sizing { box_sizing::T::content_box => fragment.border_padding.inline_start_end() + fragment.margin.inline_start_end(), box_sizing::T::border_box => fragment.margin.inline_start_end() } - }, - Mode::Block => { + } + Direction::Block => { match self.style.get_position().box_sizing { box_sizing::T::content_box => fragment.border_padding.block_start_end() + fragment.margin.block_start_end(), @@ -237,11 +227,11 @@ impl FlexItem { max(self.min_size, min(self.base_size, self.max_size)) + adjustment } - pub fn auto_margin_num(&self, mode: Mode) -> i32 { + pub fn auto_margin_num(&self, direction: Direction) -> i32 { let margin = self.style.logical_margin(); let mut margin_count = 0; - match mode { - Mode::Inline => { + match direction { + Direction::Inline => { if margin.inline_start == LengthOrPercentageOrAuto::Auto { margin_count += 1; } @@ -249,7 +239,7 @@ impl FlexItem { margin_count += 1; } } - Mode::Block => { + Direction::Block => { if margin.block_start == LengthOrPercentageOrAuto::Auto { margin_count += 1; } @@ -361,7 +351,7 @@ pub struct FlexFlow { block_flow: BlockFlow, /// The logical axis which the main axis will be parallel with. /// The cross axis will be parallel with the opposite logical axis. - main_mode: Mode, + main_mode: Direction, /// The available main axis size available_main_size: AxisSize, /// The available cross axis size @@ -389,10 +379,10 @@ impl FlexFlow { { let style = fragment.style(); let (mode, reverse) = match style.get_position().flex_direction { - flex_direction::T::row => (Mode::Inline, false), - flex_direction::T::row_reverse => (Mode::Inline, true), - flex_direction::T::column => (Mode::Block, false), - flex_direction::T::column_reverse => (Mode::Block, true), + flex_direction::T::row => (Direction::Inline, false), + flex_direction::T::row_reverse => (Direction::Inline, true), + flex_direction::T::column => (Direction::Block, false), + flex_direction::T::column_reverse => (Direction::Block, true), }; main_mode = mode; main_reverse = @@ -767,7 +757,7 @@ impl FlexFlow { for line in &self.lines { for mut item in self.items[line.range.clone()].iter_mut() { - let auto_margin_count = item.auto_margin_num(Mode::Block); + let auto_margin_count = item.auto_margin_num(Direction::Block); let mut block = flow_ref::deref_mut(&mut item.flow).as_mut_block(); let margin = block.fragment.style().logical_margin(); @@ -869,8 +859,8 @@ impl Flow for FlexFlow { self.items = items; match self.main_mode { - Mode::Inline => self.inline_mode_bubble_inline_sizes(), - Mode::Block => self.block_mode_bubble_inline_sizes() + Direction::Inline => self.inline_mode_bubble_inline_sizes(), + Direction::Block => self.block_mode_bubble_inline_sizes() } } @@ -929,7 +919,7 @@ impl Flow for FlexFlow { let content_inline_size = self.block_flow.fragment.border_box.size.inline - padding_and_borders; match self.main_mode { - Mode::Inline => { + Direction::Inline => { self.available_main_size = available_inline_size; self.available_cross_size = available_block_size; self.inline_mode_assign_inline_sizes(shared_context, @@ -937,7 +927,7 @@ impl Flow for FlexFlow { inline_end_content_edge, content_inline_size) }, - Mode::Block => { + Direction::Block => { self.available_main_size = available_block_size; self.available_cross_size = available_inline_size; self.block_mode_assign_inline_sizes(shared_context, @@ -951,9 +941,9 @@ impl Flow for FlexFlow { fn assign_block_size<'a>(&mut self, layout_context: &'a LayoutContext<'a>) { self.block_flow.assign_block_size(layout_context); match self.main_mode { - Mode::Inline => + Direction::Inline => self.inline_mode_assign_block_size(layout_context), - Mode::Block => + Direction::Block => self.block_mode_assign_block_size(layout_context) } } diff --git a/components/layout/model.rs b/components/layout/model.rs index bb9bb1736fc..f988ef370dd 100644 --- a/components/layout/model.rs +++ b/components/layout/model.rs @@ -502,6 +502,13 @@ impl ToGfxMatrix for ComputedMatrix { } } +// Used to specify the logical direction. +#[derive(Debug, Clone, Copy)] +pub enum Direction { + Inline, + Block +} + // https://drafts.csswg.org/css2/visudet.html#min-max-widths // https://drafts.csswg.org/css2/visudet.html#min-max-heights /// A min or max constraint From 62dd3f4df4deb775a852fc9be27da3c23ad96b4d Mon Sep 17 00:00:00 2001 From: Pu Xingyu Date: Mon, 25 Jul 2016 20:59:04 +0800 Subject: [PATCH 09/10] Refator 'box-sizing' calculation into a method The 'box_sizing_boundary()' method return the border_padding width in certain direction if fragment has property 'box-sizing: border-box'. The 'border_padding' field should be initialized before. --- components/layout/flex.rs | 66 +++++++++++------------------------ components/layout/fragment.rs | 16 +++++++-- 2 files changed, 35 insertions(+), 47 deletions(-) diff --git a/components/layout/flex.rs b/components/layout/flex.rs index 23d662edd2a..f551cff88af 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -26,8 +26,8 @@ use script_layout_interface::restyle_damage::{REFLOW, REFLOW_OUT_OF_FLOW}; use std::cmp::{max, min}; use std::ops::Range; use std::sync::Arc; +use style::computed_values::border_collapse; use style::computed_values::{align_content, align_self, flex_direction, flex_wrap, justify_content}; -use style::computed_values::{box_sizing, border_collapse}; use style::context::{SharedStyleContext, StyleContext}; use style::logical_geometry::LogicalSize; use style::properties::ServoComputedValues; @@ -173,13 +173,9 @@ impl FlexItem { block.fragment.compute_inline_direction_margins(containing_length); block.fragment.compute_block_direction_margins(containing_length); - let adjustment = match self.style.get_position().box_sizing { - box_sizing::T::content_box => Au(0), - box_sizing::T::border_box => - block.fragment.border_padding.inline_start_end() - }; let content_size = block.base.intrinsic_inline_sizes.preferred_inline_size - - block.fragment.surrounding_intrinsic_inline_size() + adjustment; + - block.fragment.surrounding_intrinsic_inline_size() + + block.fragment.box_sizing_boundary(direction); self.base_size = basis.specified_or_default(content_size); self.max_size = specified_or_none(self.style.max_inline_size(), containing_length) .unwrap_or(MAX_AU); @@ -189,11 +185,9 @@ impl FlexItem { let basis = from_flex_basis(self.style.get_position().flex_basis, self.style.content_block_size(), Some(containing_length)); - let content_size = match self.style.get_position().box_sizing { - box_sizing::T::border_box => block.fragment.border_box.size.block, - box_sizing::T::content_box => block.fragment.border_box.size.block - - block.fragment.border_padding.block_start_end(), - }; + let content_size = block.fragment.border_box.size.block + - block.fragment.border_padding.block_start_end() + + block.fragment.box_sizing_boundary(direction); self.base_size = basis.specified_or_default(content_size); self.max_size = specified_or_none(self.style.max_block_size(), containing_length) .unwrap_or(MAX_AU); @@ -206,25 +200,16 @@ impl FlexItem { /// clamped by max and min size. pub fn outer_main_size(&self, direction: Direction) -> Au { let ref fragment = self.flow.as_block().fragment; - let adjustment = match direction { + let outer_width = match direction { Direction::Inline => { - match self.style.get_position().box_sizing { - box_sizing::T::content_box => - fragment.border_padding.inline_start_end() + fragment.margin.inline_start_end(), - box_sizing::T::border_box => - fragment.margin.inline_start_end() - } + fragment.border_padding.inline_start_end() + fragment.margin.inline_start_end() } Direction::Block => { - match self.style.get_position().box_sizing { - box_sizing::T::content_box => - fragment.border_padding.block_start_end() + fragment.margin.block_start_end(), - box_sizing::T::border_box => - fragment.margin.block_start_end() - } + fragment.border_padding.block_start_end() + fragment.margin.block_start_end() } }; - max(self.min_size, min(self.base_size, self.max_size)) + adjustment + max(self.min_size, min(self.base_size, self.max_size)) + - fragment.box_sizing_boundary(direction) + outer_width } pub fn auto_margin_num(&self, direction: Direction) -> i32 { @@ -571,10 +556,8 @@ impl FlexFlow { self.block_flow.base.position.size.inline = inline_size; // Calculate non-auto block size to pass to children. - let box_border = match self.block_flow.fragment.style().get_position().box_sizing { - box_sizing::T::border_box => self.block_flow.fragment.border_padding.block_start_end(), - box_sizing::T::content_box => Au(0), - }; + let box_border = self.block_flow.fragment.box_sizing_boundary(Direction::Block); + let parent_container_size = self.block_flow.explicit_block_containing_size(_shared_context); // https://drafts.csswg.org/css-ui-3/#box-sizing let explicit_content_size = self @@ -645,23 +628,19 @@ impl FlexFlow { .specified_or_default(auto_len); let margin_inline_end = MaybeAuto::from_style(margin.inline_end, inline_size) .specified_or_default(auto_len); - let item_inline_size = item.main_size + - match block.fragment.style().get_position().box_sizing { - box_sizing::T::border_box => Au(0), - box_sizing::T::content_box => block.fragment.border_padding.inline_start_end(), - }; + let item_inline_size = item.main_size + - block.fragment.box_sizing_boundary(self.main_mode) + + block.fragment.border_padding.inline_start_end(); let item_outer_size = item_inline_size + block.fragment.margin.inline_start_end(); block.fragment.margin.inline_start = margin_inline_start; block.fragment.margin.inline_end = margin_inline_end; block.fragment.border_box.start.i = margin_inline_start; block.fragment.border_box.size.inline = item_inline_size; - if !self.main_reverse { - block.base.position.start.i = cur_i; + block.base.position.start.i = if !self.main_reverse { + cur_i } else { - block.base.position.start.i = - inline_start_content_edge *2 + content_inline_size - - cur_i - item_outer_size; + inline_start_content_edge * 2 + content_inline_size - cur_i - item_outer_size }; block.base.position.size.inline = item_outer_size; cur_i += item_outer_size + item_interval; @@ -708,17 +687,14 @@ impl FlexFlow { total_cross_size += line.cross_size; } - let box_border = match self.block_flow.fragment.style().get_position().box_sizing { - box_sizing::T::border_box => self.block_flow.fragment.border_padding.block_start_end(), - box_sizing::T::content_box => Au(0), - }; + let box_border = self.block_flow.fragment.box_sizing_boundary(Direction::Block); let parent_container_size = self.block_flow.explicit_block_containing_size(layout_context.shared_context()); // https://drafts.csswg.org/css-ui-3/#box-sizing let explicit_content_size = self .block_flow .explicit_block_size(parent_container_size) - .map(|x| if x < box_border { Au(0) } else { x - box_border }); + .map(|x| max(x - box_border, Au(0))); if let Some(container_block_size) = explicit_content_size { let free_space = container_block_size - total_cross_size; diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index f235bd64331..217ee90584d 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -23,7 +23,7 @@ use inline::{InlineMetrics, LAST_FRAGMENT_OF_ELEMENT}; use ipc_channel::ipc::IpcSender; #[cfg(debug_assertions)] use layout_debug; -use model::{self, IntrinsicISizes, IntrinsicISizesContribution, MaybeAuto, specified}; +use model::{self, Direction, IntrinsicISizes, IntrinsicISizesContribution, MaybeAuto, specified}; use msg::constellation_msg::PipelineId; use net_traits::image::base::{Image, ImageMetadata}; use net_traits::image_cache_thread::{ImageOrMetadataAvailable, UsePlaceholder}; @@ -39,7 +39,7 @@ use std::fmt; use std::sync::{Arc, Mutex}; use style::arc_ptr_eq; use style::computed_values::content::ContentItem; -use style::computed_values::{border_collapse, clear, color, display, mix_blend_mode}; +use style::computed_values::{border_collapse, box_sizing, clear, color, display, mix_blend_mode}; use style::computed_values::{overflow_wrap, overflow_x, position, text_decoration}; use style::computed_values::{transform_style, vertical_align, white_space, word_break, z_index}; use style::dom::TRestyleDamage; @@ -1102,6 +1102,18 @@ impl Fragment { } } + pub fn box_sizing_boundary(&self, direction: Direction) -> Au { + match (self.style().get_position().box_sizing, direction) { + (box_sizing::T::border_box, Direction::Inline) => { + self.border_padding.inline_start_end() + } + (box_sizing::T::border_box, Direction::Block) => { + self.border_padding.block_start_end() + } + _ => Au(0) + } + } + /// Computes the margins in the inline direction from the containing block inline-size and the /// style. After this call, the inline direction of the `margin` field will be correct. /// From 60e2f44a1950559398fa25aa9aa36cd2a7fa39ad Mon Sep 17 00:00:00 2001 From: Pu Xingyu Date: Tue, 26 Jul 2016 00:50:35 +0800 Subject: [PATCH 10/10] Add Minor fixes and tests --- components/layout/block.rs | 2 +- components/layout/flex.rs | 53 +++++++++---------- components/layout/fragment.rs | 2 + .../html/align-content-001.htm.ini | 3 -- .../html/align-content-002.htm.ini | 3 -- .../html/align-content-003.htm.ini | 3 -- .../html/align-content-005.htm.ini | 3 -- .../html/align-content-006.htm.ini | 3 -- .../html/align-self-005.htm.ini | 3 -- .../html/css-box-justify-content.htm.ini | 3 -- .../css-flexbox-1_dev/html/flex-002.htm.ini | 3 -- .../css-flexbox-1_dev/html/flex-003.htm.ini | 3 -- .../css-flexbox-1_dev/html/flex-004.htm.ini | 3 -- .../html/flex-align-items-center.htm.ini | 3 -- .../html/flex-basis-001.htm.ini | 3 -- .../html/flex-basis-002.htm.ini | 3 -- .../html/flex-basis-003.htm.ini | 3 -- .../html/flex-basis-004.htm.ini | 3 -- .../html/flex-basis-005.htm.ini | 3 -- .../html/flex-basis-006.htm.ini | 3 -- .../html/flex-basis-008.htm.ini | 3 -- .../html/flex-box-wrap.htm.ini | 3 -- .../html/flex-container-margin.htm.ini | 3 -- .../html/flex-direction-modify.htm.ini | 3 -- .../html/flex-flow-001.htm.ini | 3 -- .../html/flex-flow-002.htm.ini | 3 -- .../html/flex-flow-003.htm.ini | 3 -- .../html/flex-flow-004.htm.ini | 3 -- .../html/flex-flow-005.htm.ini | 3 -- .../html/flex-flow-006.htm.ini | 3 -- .../html/flex-grow-001.htm.ini | 3 -- .../html/flex-grow-002.htm.ini | 3 -- .../html/flex-grow-003.htm.ini | 3 -- .../html/flex-grow-005.htm.ini | 3 -- .../html/flex-items-flexibility.htm.ini | 3 -- .../html/flex-shrink-001.htm.ini | 3 -- .../html/flex-shrink-002.htm.ini | 3 -- .../html/flex-shrink-003.htm.ini | 3 -- .../html/flex-shrink-004.htm.ini | 3 -- .../html/flex-shrink-005.htm.ini | 3 -- .../html/flex-shrink-006.htm.ini | 3 -- .../html/flex-shrink-007.htm.ini | 3 -- .../html/flexbox-abspos-child-001a.htm.ini | 3 -- .../html/flexbox-anonymous-items-001.htm.ini | 3 -- .../flexbox-basic-block-horiz-001.htm.ini | 3 -- .../html/flexbox-flex-wrap-default.htm.ini | 3 -- .../html/flexbox-flex-wrap-horiz-001.htm.ini | 3 -- .../html/flexbox-flex-wrap-horiz-002.htm.ini | 3 -- .../html/flexbox-flex-wrap-nowrap.htm.ini | 3 -- ...box-items-as-stacking-contexts-002.htm.ini | 3 -- ...box-items-as-stacking-contexts-003.htm.ini | 3 -- ...flexbox-justify-content-horiz-001a.htm.ini | 3 -- ...flexbox-justify-content-horiz-001b.htm.ini | 3 -- .../flexbox-justify-content-horiz-003.htm.ini | 3 -- .../flexbox-mbp-horiz-001-reverse.htm.ini | 3 -- .../html/flexbox-mbp-horiz-001.htm.ini | 3 -- .../html/flexbox-mbp-horiz-002a.htm.ini | 3 -- .../html/flexbox-mbp-horiz-002b.htm.ini | 3 -- .../flexbox-mbp-horiz-003-reverse.htm.ini | 3 -- .../html/flexbox-mbp-horiz-003.htm.ini | 3 -- .../flexbox-whitespace-handling-001b.htm.ini | 3 -- .../html/flexbox-writing-mode-007.htm.ini | 3 -- .../html/flexbox_align-content-center.htm.ini | 3 -- .../flexbox_align-content-flexend.htm.ini | 3 -- .../flexbox_align-content-flexstart.htm.ini | 3 -- .../flexbox_align-content-spacearound.htm.ini | 3 -- ...flexbox_align-content-spacebetween.htm.ini | 3 -- .../flexbox_align-content-stretch-2.htm.ini | 3 -- .../flexbox_align-content-stretch.htm.ini | 3 -- .../html/flexbox_align-items-center-2.htm.ini | 3 -- .../html/flexbox_align-items-center.htm.ini | 3 -- .../flexbox_align-items-flexend-2.htm.ini | 3 -- .../html/flexbox_align-items-flexend.htm.ini | 3 -- .../flexbox_align-items-flexstart-2.htm.ini | 3 -- .../flexbox_align-items-flexstart.htm.ini | 3 -- ..._align-items-stretch-writing-modes.htm.ini | 3 ++ .../html/flexbox_align-items-stretch.htm.ini | 3 -- .../html/flexbox_align-self-auto.htm.ini | 3 -- .../html/flexbox_align-self-baseline.htm.ini | 3 -- .../html/flexbox_align-self-center.htm.ini | 3 -- .../html/flexbox_align-self-flexend.htm.ini | 3 -- .../html/flexbox_align-self-flexstart.htm.ini | 3 -- .../html/flexbox_align-self-stretch.htm.ini | 3 -- ...exbox_computedstyle_min-width-auto.htm.ini | 3 +- .../flexbox_direction-row-reverse.htm.ini | 3 +- .../flexbox_flex-0-0-1-unitless-basis.htm.ini | 3 -- .../html/flexbox_flex-0-0-N-shrink.htm.ini | 3 -- .../flexbox_flex-0-0-N-unitless-basis.htm.ini | 3 -- .../html/flexbox_flex-0-0-N.htm.ini | 3 -- .../flexbox_flex-0-0-Npercent-shrink.htm.ini | 3 -- .../html/flexbox_flex-0-0-Npercent.htm.ini | 3 -- .../html/flexbox_flex-0-0-auto-shrink.htm.ini | 3 -- .../html/flexbox_flex-0-0-auto.htm.ini | 3 -- .../flexbox_flex-0-1-1-unitless-basis.htm.ini | 3 -- .../html/flexbox_flex-0-1-N-shrink.htm.ini | 3 -- .../flexbox_flex-0-1-N-unitless-basis.htm.ini | 3 -- .../html/flexbox_flex-0-1-N.htm.ini | 3 -- .../flexbox_flex-0-1-Npercent-shrink.htm.ini | 3 -- .../html/flexbox_flex-0-1-Npercent.htm.ini | 3 -- .../html/flexbox_flex-0-1-auto-shrink.htm.ini | 3 -- .../html/flexbox_flex-0-1-auto.htm.ini | 3 -- .../html/flexbox_flex-0-N-N-shrink.htm.ini | 3 -- .../html/flexbox_flex-0-N-N.htm.ini | 3 -- .../flexbox_flex-0-N-Npercent-shrink.htm.ini | 3 -- .../html/flexbox_flex-0-N-Npercent.htm.ini | 3 -- .../html/flexbox_flex-0-N-auto-shrink.htm.ini | 3 -- .../html/flexbox_flex-0-N-auto.htm.ini | 3 -- .../html/flexbox_flex-0-auto.htm.ini | 3 -- .../html/flexbox_flex-1-0-0-unitless.htm.ini | 3 -- .../html/flexbox_flex-1-0-0.htm.ini | 3 -- .../html/flexbox_flex-1-0-N-shrink.htm.ini | 3 -- .../html/flexbox_flex-1-0-N.htm.ini | 3 -- .../flexbox_flex-1-0-Npercent-shrink.htm.ini | 3 -- .../html/flexbox_flex-1-0-Npercent.htm.ini | 3 -- .../html/flexbox_flex-1-0-auto-shrink.htm.ini | 3 -- .../html/flexbox_flex-1-0-auto.htm.ini | 3 -- .../html/flexbox_flex-1-0.htm.ini | 3 -- .../html/flexbox_flex-1-1-0-unitless.htm.ini | 3 -- .../html/flexbox_flex-1-1-0.htm.ini | 3 -- .../html/flexbox_flex-1-1-N-shrink.htm.ini | 3 -- .../html/flexbox_flex-1-1-N.htm.ini | 3 -- .../flexbox_flex-1-1-Npercent-shrink.htm.ini | 3 -- .../html/flexbox_flex-1-1-Npercent.htm.ini | 3 -- .../html/flexbox_flex-1-1-auto-shrink.htm.ini | 3 -- .../html/flexbox_flex-1-1-auto.htm.ini | 3 -- .../html/flexbox_flex-1-1.htm.ini | 3 -- .../html/flexbox_flex-1-N-0-unitless.htm.ini | 3 -- .../html/flexbox_flex-1-N-0.htm.ini | 3 -- .../html/flexbox_flex-1-N-N-shrink.htm.ini | 3 -- .../html/flexbox_flex-1-N-N.htm.ini | 3 -- .../flexbox_flex-1-N-Npercent-shrink.htm.ini | 3 -- .../html/flexbox_flex-1-N-Npercent.htm.ini | 3 -- .../html/flexbox_flex-1-N-auto-shrink.htm.ini | 3 -- .../html/flexbox_flex-1-N-auto.htm.ini | 3 -- .../html/flexbox_flex-1-N.htm.ini | 3 -- .../html/flexbox_flex-N-0-0-unitless.htm.ini | 3 -- .../html/flexbox_flex-N-0-0.htm.ini | 3 -- .../html/flexbox_flex-N-0-N-shrink.htm.ini | 3 -- .../html/flexbox_flex-N-0-N.htm.ini | 3 -- .../flexbox_flex-N-0-Npercent-shrink.htm.ini | 3 -- .../html/flexbox_flex-N-0-Npercent.htm.ini | 3 -- .../html/flexbox_flex-N-0-auto-shrink.htm.ini | 3 -- .../html/flexbox_flex-N-0-auto.htm.ini | 3 -- .../html/flexbox_flex-N-0.htm.ini | 3 -- .../html/flexbox_flex-N-1-0-unitless.htm.ini | 3 -- .../html/flexbox_flex-N-1-0.htm.ini | 3 -- .../html/flexbox_flex-N-1-N-shrink.htm.ini | 3 -- .../html/flexbox_flex-N-1-N.htm.ini | 3 -- .../flexbox_flex-N-1-Npercent-shrink.htm.ini | 3 -- .../html/flexbox_flex-N-1-Npercent.htm.ini | 3 -- .../html/flexbox_flex-N-1-auto-shrink.htm.ini | 3 -- .../html/flexbox_flex-N-1-auto.htm.ini | 3 -- .../html/flexbox_flex-N-1.htm.ini | 3 -- .../html/flexbox_flex-N-N-0-unitless.htm.ini | 3 -- .../html/flexbox_flex-N-N-0.htm.ini | 3 -- .../html/flexbox_flex-N-N-N-shrink.htm.ini | 3 -- .../html/flexbox_flex-N-N-N.htm.ini | 3 -- .../flexbox_flex-N-N-Npercent-shrink.htm.ini | 3 -- .../html/flexbox_flex-N-N-Npercent.htm.ini | 3 -- .../html/flexbox_flex-N-N-auto-shrink.htm.ini | 3 -- .../html/flexbox_flex-N-N-auto.htm.ini | 3 -- .../html/flexbox_flex-N-N.htm.ini | 3 -- .../html/flexbox_flex-auto.htm.ini | 3 -- .../html/flexbox_flex-basis-shrink.htm.ini | 3 -- .../html/flexbox_flex-basis.htm.ini | 3 -- .../html/flexbox_flex-initial-2.htm.ini | 3 -- .../html/flexbox_flex-initial.htm.ini | 3 -- ...xbox_flex-natural-mixed-basis-auto.htm.ini | 3 -- .../flexbox_flex-natural-mixed-basis.htm.ini | 3 -- ...x_flex-natural-variable-auto-basis.htm.ini | 3 -- ...x_flex-natural-variable-zero-basis.htm.ini | 3 -- .../html/flexbox_flex-natural.htm.ini | 3 -- .../html/flexbox_flex-none.htm.ini | 3 -- .../flexbox_flow-row-wrap-reverse.htm.ini | 3 -- .../html/flexbox_flow-row-wrap.htm.ini | 3 -- .../html/flexbox_item-vertical-align.htm.ini | 3 -- ...ox_justifycontent-spacearound-only.htm.ini | 3 -- .../flexbox_margin-auto-overflow-2.htm.ini | 3 -- .../html/flexbox_margin-auto-overflow.htm.ini | 3 -- .../html/flexbox_margin-left-ex.htm.ini | 3 -- .../flexbox_order-abspos-space-around.htm.ini | 3 -- .../html/flexbox_order-box.htm.ini | 3 -- .../html/flexbox_wrap-long.htm.ini | 3 -- .../html/flexbox_wrap-reverse.htm.ini | 3 -- .../html/flexbox_wrap.htm.ini | 3 -- .../html/justify-content-001.htm.ini | 3 -- .../html/justify-content-002.htm.ini | 3 -- .../html/justify-content-003.htm.ini | 3 -- .../html/justify-content-004.htm.ini | 3 -- .../html/justify-content-005.htm.ini | 3 -- .../html/order-with-row-reverse.htm.ini | 3 -- ...-reftest-flex-align-content-center.htm.ini | 3 -- ...twf-reftest-flex-align-content-end.htm.ini | 3 -- ...st-flex-align-content-space-around.htm.ini | 3 -- ...t-flex-align-content-space-between.htm.ini | 3 -- ...f-reftest-flex-align-content-start.htm.ini | 3 -- .../html/ttwf-reftest-flex-base.htm.ini | 3 -- ...reftest-flex-direction-row-reverse.htm.ini | 3 -- .../html/ttwf-reftest-flex-order.htm.ini | 3 -- 199 files changed, 34 insertions(+), 611 deletions(-) delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-001.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-002.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-003.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-005.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-006.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/align-self-005.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/css-box-justify-content.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-002.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-003.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-004.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-align-items-center.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-001.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-002.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-003.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-004.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-005.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-006.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-008.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-box-wrap.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-container-margin.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-direction-modify.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-001.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-002.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-003.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-004.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-005.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-006.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-001.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-002.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-003.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-005.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-items-flexibility.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-001.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-002.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-003.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-004.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-005.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-006.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-007.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-abspos-child-001a.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-anonymous-items-001.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-basic-block-horiz-001.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-default.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-horiz-001.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-horiz-002.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-nowrap.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-items-as-stacking-contexts-002.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-items-as-stacking-contexts-003.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-001a.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-001b.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-003.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-001-reverse.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-001.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-002a.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-002b.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-003-reverse.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-003.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-whitespace-handling-001b.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-writing-mode-007.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-center.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-flexend.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-flexstart.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-spacearound.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-spacebetween.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-stretch-2.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-stretch.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-center-2.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-center.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexend-2.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexend.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexstart-2.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexstart.htm.ini create mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch-writing-modes.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-auto.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-baseline.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-center.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-flexend.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-flexstart.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-stretch.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-1-unitless-basis.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N-unitless-basis.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-Npercent-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-Npercent.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-auto-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-auto.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-1-unitless-basis.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N-unitless-basis.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-Npercent-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-Npercent.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-auto-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-auto.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-N-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-N.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-Npercent-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-Npercent.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-auto-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-auto.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-auto.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-0-unitless.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-0.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-N-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-N.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-Npercent-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-Npercent.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-auto-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-auto.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-0-unitless.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-0.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-N-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-N.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-Npercent-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-Npercent.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-auto-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-auto.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-0-unitless.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-0.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-N-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-N.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-Npercent-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-Npercent.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-auto-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-auto.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-0-unitless.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-0.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-N-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-N.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-Npercent-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-Npercent.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-auto-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-auto.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-0-unitless.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-0.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-N-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-N.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-Npercent-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-Npercent.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-auto-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-auto.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-0-unitless.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-0.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-N-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-N.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-Npercent-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-Npercent.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-auto-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-auto.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-auto.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-basis-shrink.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-basis.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-initial-2.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-initial.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-mixed-basis-auto.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-mixed-basis.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-variable-auto-basis.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-variable-zero-basis.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-none.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flow-row-wrap-reverse.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flow-row-wrap.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_item-vertical-align.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacearound-only.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-auto-overflow-2.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-auto-overflow.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-left-ex.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_order-abspos-space-around.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_order-box.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap-long.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap-reverse.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-001.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-002.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-003.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-004.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-005.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/order-with-row-reverse.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-center.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-end.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-space-around.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-space-between.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-start.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-base.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-direction-row-reverse.htm.ini delete mode 100644 tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-order.htm.ini diff --git a/components/layout/block.rs b/components/layout/block.rs index f1501411fe1..16a837d4dcc 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -3089,7 +3089,7 @@ impl ISizeAndMarginsComputer for FlexItem { container_block_size); } - // Literally do nothing. + // The used inline size and margins are set by parent flex flow, do nothing here. fn solve_inline_size_constraints(&self, block: &mut BlockFlow, _: &ISizeConstraintInput) diff --git a/components/layout/flex.rs b/components/layout/flex.rs index f551cff88af..f591f023f04 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -55,13 +55,13 @@ impl AxisSize { Some(size) => AxisSize::Definite(size.scale_by(percent)), None => AxisSize::Infinite } - }, + } LengthOrPercentageOrAuto::Calc(calc) => { match content_size { Some(size) => AxisSize::Definite(size.scale_by(calc.percentage())), None => AxisSize::Infinite } - }, + } LengthOrPercentageOrAuto::Auto => { AxisSize::MinMax(MinMaxConstraint::new(content_size, min, max)) } @@ -136,7 +136,7 @@ impl FlexItem { let flex_grow = style.get_position().flex_grow; let flex_shrink = style.get_position().flex_shrink; let order = style.get_position().order; - // TODO(stshine): for item with visibility:collapse, set is_strut to true. + // TODO(stshine): for item with 'visibility:collapse', set is_strut to true. FlexItem { main_size: Au(0), @@ -196,7 +196,7 @@ impl FlexItem { } } - /// Return the outer main size of the item, including paddings and margins, + /// Returns the outer main size of the item, including paddings and margins, /// clamped by max and min size. pub fn outer_main_size(&self, direction: Direction) -> Au { let ref fragment = self.flow.as_block().fragment; @@ -212,7 +212,8 @@ impl FlexItem { - fragment.box_sizing_boundary(direction) + outer_width } - pub fn auto_margin_num(&self, direction: Direction) -> i32 { + /// Returns the number of auto margins in given direction. + pub fn auto_margin_count(&self, direction: Direction) -> i32 { let margin = self.style.logical_margin(); let mut margin_count = 0; match direction { @@ -243,9 +244,9 @@ impl FlexItem { struct FlexLine { /// Range of items belong to this line in 'self.items'. pub range: Range, - /// Remainig free space of this line, items will grow or shrink based on it being positive or negative. + /// Remaining free space of this line, items will grow or shrink based on it being positive or negative. pub free_space: Au, - /// the number of auto margins of items. + /// The number of auto margins of items. pub auto_margin_count: i32, /// Line size in the block direction. pub cross_size: Au, @@ -262,7 +263,7 @@ impl FlexLine { } /// This method implements the flexible lengths resolving algorithm. - /// The 'collapse' parameter is used to indicate whether items with 'visibility: hidden' + /// The 'collapse' parameter is used to indicate whether items with 'visibility: collapse' /// is included in length resolving. The result main size is stored in 'item.main_size'. /// https://drafts.csswg.org/css-flexbox/#resolve-flexible-lengths pub fn flex_resolve(&mut self, items: &mut [FlexItem], collapse: bool) { @@ -399,15 +400,11 @@ impl FlexFlow { /// Note that when the container main size is infinite(i.e. A column flexbox with auto height), /// we do not need to do flex resolving and this can be considered as a fast-path, so the /// 'container_size' param does not need to be 'None'. A line has to contain at least one item; - /// (expect this) if the container can be multi-line the sum of outer main size of items should + /// (except this) if the container can be multi-line the sum of outer main size of items should /// be less than the container size; a line should be filled by items as much as possible. /// After been collected in a line a item should have its main sizes initialized. fn get_flex_line(&mut self, container_size: Au) -> Option { - let start = if self.lines.len() == 0 { - 0 - } else { - self.lines[self.lines.len()-1].range.end - }; + let start = self.lines.last().map(|line| line.range.end).unwrap_or(0); if start == self.items.len() { return None; } @@ -416,13 +413,13 @@ impl FlexFlow { let mut margin_count = 0; let items = &mut self.items[start..]; - for mut item in items.iter_mut() { + for mut item in items { item.init_sizes(container_size, self.main_mode); let outer_main_size = item.outer_main_size(self.main_mode); - if total_line_size + outer_main_size > container_size && end != start && self.is_wrappable { + if total_line_size + outer_main_size > container_size && end != start && self.is_wrappable { break; } - margin_count += item.auto_margin_num(self.main_mode); + margin_count += item.auto_margin_count(self.main_mode); total_line_size += outer_main_size; end += 1; } @@ -563,7 +560,7 @@ impl FlexFlow { let explicit_content_size = self .block_flow .explicit_block_size(parent_container_size) - .map(|x| if x < box_border { Au(0) } else { x - box_border }); + .map(|x| max(x - box_border, Au(0))); let containing_block_text_align = self.block_flow.fragment.style().get_inheritedtext().text_align; @@ -571,7 +568,7 @@ impl FlexFlow { let items = &mut self.items[line.range.clone()]; line.flex_resolve(items, false); // TODO(stshine): if this flex line contain children that have - // property visibility:hidden, exclude them and resolve again. + // property visibility:collapse, exclude them and resolve again. let item_count = items.len() as i32; let mut cur_i = inline_start_content_edge; @@ -583,10 +580,10 @@ impl FlexFlow { } else { line.free_space / (item_count - 1) } - }, + } justify_content::T::space_around => { line.free_space / item_count - }, + } _ => Au(0), } } else { @@ -594,7 +591,7 @@ impl FlexFlow { }; match self.block_flow.fragment.style().get_position().justify_content { - // Overflow equally in both end. + // Overflow equally in both ends of line. justify_content::T::center | justify_content::T::space_around => { cur_i += (line.free_space - item_interval * (item_count - 1)) / 2; } @@ -711,12 +708,12 @@ impl FlexFlow { if line_count == 1 { Au(0) } else { - free_space /(line_count - 1) + free_space / (line_count - 1) } - }, + } align_content::T::space_around => { free_space / line_count - }, + } _ => Au(0), }; @@ -733,7 +730,7 @@ impl FlexFlow { for line in &self.lines { for mut item in self.items[line.range.clone()].iter_mut() { - let auto_margin_count = item.auto_margin_num(Direction::Block); + let auto_margin_count = item.auto_margin_count(Direction::Block); let mut block = flow_ref::deref_mut(&mut item.flow).as_mut_block(); let margin = block.fragment.style().logical_margin(); @@ -773,7 +770,7 @@ impl FlexFlow { if !self.cross_reverse { cur_b } else { - self.block_flow.fragment.border_padding.block_start *2 + self.block_flow.fragment.border_padding.block_start * 2 + total_cross_size - cur_b - line.cross_size }; // TODO(stshine): support baseline alignment. @@ -902,7 +899,7 @@ impl Flow for FlexFlow { inline_start_content_edge, inline_end_content_edge, content_inline_size) - }, + } Direction::Block => { self.available_main_size = available_block_size; self.available_cross_size = available_inline_size; diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 217ee90584d..6a6071aa3c7 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -1102,6 +1102,8 @@ impl Fragment { } } + /// Returns the border width in given direction if this fragment has property + /// 'box-sizing: border-box'. The `border_padding` field should have been initialized. pub fn box_sizing_boundary(&self, direction: Direction) -> Au { match (self.style().get_position().box_sizing, direction) { (box_sizing::T::border_box, Direction::Inline) => { diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-001.htm.ini deleted file mode 100644 index c410cf86896..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-001.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[align-content-001.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-002.htm.ini deleted file mode 100644 index b27fb3ad6f1..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-002.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[align-content-002.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-003.htm.ini deleted file mode 100644 index a260fbe21af..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-003.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[align-content-003.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-005.htm.ini deleted file mode 100644 index eb31ad82019..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-005.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[align-content-005.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-006.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-006.htm.ini deleted file mode 100644 index fab42a5cf0b..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-content-006.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[align-content-006.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-self-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-self-005.htm.ini deleted file mode 100644 index 6269e2dd181..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/align-self-005.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[align-self-005.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/css-box-justify-content.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/css-box-justify-content.htm.ini deleted file mode 100644 index a377b889268..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/css-box-justify-content.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[css-box-justify-content.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-002.htm.ini deleted file mode 100644 index 5593f3ffa96..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-002.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-002.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-003.htm.ini deleted file mode 100644 index 4df379c30a2..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-003.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-003.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-004.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-004.htm.ini deleted file mode 100644 index 5fdc2326348..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-004.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-004.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-align-items-center.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-align-items-center.htm.ini deleted file mode 100644 index 78295d3c161..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-align-items-center.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-align-items-center.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-001.htm.ini deleted file mode 100644 index 2fd1aac425d..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-001.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-basis-001.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-002.htm.ini deleted file mode 100644 index 06e0a5f0add..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-002.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-basis-002.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-003.htm.ini deleted file mode 100644 index 8c9995a0386..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-003.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-basis-003.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-004.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-004.htm.ini deleted file mode 100644 index f383bd4c0fb..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-004.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-basis-004.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-005.htm.ini deleted file mode 100644 index a1bb49f5b10..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-005.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-basis-005.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-006.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-006.htm.ini deleted file mode 100644 index 57a4f3ed871..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-006.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-basis-006.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-008.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-008.htm.ini deleted file mode 100644 index 1086a689543..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-basis-008.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-basis-008.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-box-wrap.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-box-wrap.htm.ini deleted file mode 100644 index 4f185923ea2..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-box-wrap.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-box-wrap.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-container-margin.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-container-margin.htm.ini deleted file mode 100644 index 97db63cb4fb..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-container-margin.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-container-margin.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-direction-modify.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-direction-modify.htm.ini deleted file mode 100644 index 6797bda6176..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-direction-modify.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-direction-modify.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-001.htm.ini deleted file mode 100644 index a88c1394b57..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-001.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-flow-001.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-002.htm.ini deleted file mode 100644 index 44a2e011b8d..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-002.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-flow-002.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-003.htm.ini deleted file mode 100644 index 02f8968c83a..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-003.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-flow-003.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-004.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-004.htm.ini deleted file mode 100644 index f0109bdadd4..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-004.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-flow-004.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-005.htm.ini deleted file mode 100644 index 90e7606b7ce..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-005.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-flow-005.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-006.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-006.htm.ini deleted file mode 100644 index a9933ee0c06..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-flow-006.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-flow-006.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-001.htm.ini deleted file mode 100644 index 978a4faf80b..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-001.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-grow-001.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-002.htm.ini deleted file mode 100644 index c7f4a46a6f0..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-002.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-grow-002.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-003.htm.ini deleted file mode 100644 index c1ffdb9dcac..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-003.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-grow-003.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-005.htm.ini deleted file mode 100644 index adf9c43dbf4..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-grow-005.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-grow-005.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-items-flexibility.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-items-flexibility.htm.ini deleted file mode 100644 index bd6ce48df78..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-items-flexibility.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-items-flexibility.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-001.htm.ini deleted file mode 100644 index 9575d290198..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-001.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-shrink-001.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-002.htm.ini deleted file mode 100644 index c7c61bf4e7d..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-002.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-shrink-002.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-003.htm.ini deleted file mode 100644 index b70170a52b1..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-003.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-shrink-003.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-004.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-004.htm.ini deleted file mode 100644 index 7a7c35c513a..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-004.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-shrink-004.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-005.htm.ini deleted file mode 100644 index 79c941f95db..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-005.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-shrink-005.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-006.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-006.htm.ini deleted file mode 100644 index 125d4a121e5..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-006.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-shrink-006.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-007.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-007.htm.ini deleted file mode 100644 index abb57eef366..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flex-shrink-007.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flex-shrink-007.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-abspos-child-001a.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-abspos-child-001a.htm.ini deleted file mode 100644 index 54923b9c528..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-abspos-child-001a.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-abspos-child-001a.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-anonymous-items-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-anonymous-items-001.htm.ini deleted file mode 100644 index 9122a0ef3cb..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-anonymous-items-001.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-anonymous-items-001.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-basic-block-horiz-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-basic-block-horiz-001.htm.ini deleted file mode 100644 index d19bfd9b84f..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-basic-block-horiz-001.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-basic-block-horiz-001.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-default.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-default.htm.ini deleted file mode 100644 index f2d8edb602f..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-default.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-flex-wrap-default.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-horiz-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-horiz-001.htm.ini deleted file mode 100644 index 95b7876cab5..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-horiz-001.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-flex-wrap-horiz-001.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-horiz-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-horiz-002.htm.ini deleted file mode 100644 index 10f83d241c1..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-horiz-002.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-flex-wrap-horiz-002.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-nowrap.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-nowrap.htm.ini deleted file mode 100644 index 8833453c17c..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-flex-wrap-nowrap.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-flex-wrap-nowrap.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-items-as-stacking-contexts-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-items-as-stacking-contexts-002.htm.ini deleted file mode 100644 index 3e5b12e5ab4..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-items-as-stacking-contexts-002.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-items-as-stacking-contexts-002.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-items-as-stacking-contexts-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-items-as-stacking-contexts-003.htm.ini deleted file mode 100644 index 0547b3a465a..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-items-as-stacking-contexts-003.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-items-as-stacking-contexts-003.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-001a.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-001a.htm.ini deleted file mode 100644 index 8bb6f9d9bc6..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-001a.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-justify-content-horiz-001a.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-001b.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-001b.htm.ini deleted file mode 100644 index 8dae762b63b..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-001b.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-justify-content-horiz-001b.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-003.htm.ini deleted file mode 100644 index 44399cfd7d5..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-justify-content-horiz-003.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-justify-content-horiz-003.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-001-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-001-reverse.htm.ini deleted file mode 100644 index b6c1e86f297..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-001-reverse.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-mbp-horiz-001-reverse.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-001.htm.ini deleted file mode 100644 index d4a81a2b270..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-001.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-mbp-horiz-001.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-002a.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-002a.htm.ini deleted file mode 100644 index 3716b7622c6..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-002a.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-mbp-horiz-002a.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-002b.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-002b.htm.ini deleted file mode 100644 index dfb347076e2..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-002b.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-mbp-horiz-002b.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-003-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-003-reverse.htm.ini deleted file mode 100644 index cb097e09578..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-003-reverse.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-mbp-horiz-003-reverse.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-003.htm.ini deleted file mode 100644 index ed6f23ff1ca..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-mbp-horiz-003.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-mbp-horiz-003.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-whitespace-handling-001b.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-whitespace-handling-001b.htm.ini deleted file mode 100644 index 66c2432e227..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-whitespace-handling-001b.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-whitespace-handling-001b.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-writing-mode-007.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-writing-mode-007.htm.ini deleted file mode 100644 index 1a551dffca8..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox-writing-mode-007.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox-writing-mode-007.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-center.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-center.htm.ini deleted file mode 100644 index 36f3dd5eeed..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-center.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-content-center.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-flexend.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-flexend.htm.ini deleted file mode 100644 index 8eef80ce02d..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-flexend.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-content-flexend.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-flexstart.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-flexstart.htm.ini deleted file mode 100644 index ebde49128d7..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-flexstart.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-content-flexstart.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-spacearound.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-spacearound.htm.ini deleted file mode 100644 index 1b82b37e63a..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-spacearound.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-content-spacearound.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-spacebetween.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-spacebetween.htm.ini deleted file mode 100644 index 1d42640763a..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-spacebetween.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-content-spacebetween.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-stretch-2.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-stretch-2.htm.ini deleted file mode 100644 index b1b7e2da7e0..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-stretch-2.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-content-stretch-2.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-stretch.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-stretch.htm.ini deleted file mode 100644 index b60227667d0..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-content-stretch.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-content-stretch.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-center-2.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-center-2.htm.ini deleted file mode 100644 index 2eef1ee8486..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-center-2.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-items-center-2.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-center.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-center.htm.ini deleted file mode 100644 index b08896131c1..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-center.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-items-center.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexend-2.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexend-2.htm.ini deleted file mode 100644 index 80b8334ccb3..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexend-2.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-items-flexend-2.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexend.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexend.htm.ini deleted file mode 100644 index 0bf418a4672..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexend.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-items-flexend.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexstart-2.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexstart-2.htm.ini deleted file mode 100644 index 2c5f28d8833..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexstart-2.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-items-flexstart-2.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexstart.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexstart.htm.ini deleted file mode 100644 index a3745be75ba..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-flexstart.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-items-flexstart.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch-writing-modes.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch-writing-modes.htm.ini new file mode 100644 index 00000000000..bb252206b40 --- /dev/null +++ b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch-writing-modes.htm.ini @@ -0,0 +1,3 @@ +[flexbox_align-items-stretch-writing-modes.htm] + type: reftest + expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch.htm.ini deleted file mode 100644 index f8e851863e3..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-items-stretch.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-items-stretch.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-auto.htm.ini deleted file mode 100644 index 0815f70b834..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-auto.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-self-auto.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-baseline.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-baseline.htm.ini deleted file mode 100644 index bb724adb1a0..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-baseline.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-self-baseline.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-center.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-center.htm.ini deleted file mode 100644 index 9f03588b774..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-center.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-self-center.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-flexend.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-flexend.htm.ini deleted file mode 100644 index 7584512da96..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-flexend.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-self-flexend.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-flexstart.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-flexstart.htm.ini deleted file mode 100644 index 8201a7d8e61..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-flexstart.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-self-flexstart.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-stretch.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-stretch.htm.ini deleted file mode 100644 index 653a79cc0c6..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_align-self-stretch.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_align-self-stretch.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_min-width-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_min-width-auto.htm.ini index 914e6b9e418..c37a3dee6e6 100644 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_min-width-auto.htm.ini +++ b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_computedstyle_min-width-auto.htm.ini @@ -1,5 +1,4 @@ [flexbox_computedstyle_min-width-auto.htm] type: testharness - [flexbox | computed style | min-width: auto] - expected: FAIL + expected: TIMEOUT diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_direction-row-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_direction-row-reverse.htm.ini index ce77d1c5204..4b0333dd2cf 100644 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_direction-row-reverse.htm.ini +++ b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_direction-row-reverse.htm.ini @@ -1,3 +1,4 @@ [flexbox_direction-row-reverse.htm] type: reftest - expected: FAIL + expected: + if os == "mac": FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-1-unitless-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-1-unitless-basis.htm.ini deleted file mode 100644 index da1bcbe0a99..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-1-unitless-basis.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-0-1-unitless-basis.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N-shrink.htm.ini deleted file mode 100644 index ee71e23f76b..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-0-N-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N-unitless-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N-unitless-basis.htm.ini deleted file mode 100644 index dc749a5fe6c..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N-unitless-basis.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-0-N-unitless-basis.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N.htm.ini deleted file mode 100644 index 8202e518f7d..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-N.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-0-N.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-Npercent-shrink.htm.ini deleted file mode 100644 index fb0b6db1307..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-Npercent-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-0-Npercent-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-Npercent.htm.ini deleted file mode 100644 index 8a94ed4c07f..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-Npercent.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-0-Npercent.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-auto-shrink.htm.ini deleted file mode 100644 index 896d819e14a..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-auto-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-0-auto-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-auto.htm.ini deleted file mode 100644 index ce631c77046..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-0-auto.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-0-auto.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-1-unitless-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-1-unitless-basis.htm.ini deleted file mode 100644 index 3b20e5e4c4f..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-1-unitless-basis.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-1-1-unitless-basis.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N-shrink.htm.ini deleted file mode 100644 index 209cb8b3c27..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-1-N-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N-unitless-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N-unitless-basis.htm.ini deleted file mode 100644 index 15edbf4a0cf..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N-unitless-basis.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-1-N-unitless-basis.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N.htm.ini deleted file mode 100644 index cbdbff4d81b..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-N.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-1-N.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-Npercent-shrink.htm.ini deleted file mode 100644 index 2e037cb9cc8..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-Npercent-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-1-Npercent-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-Npercent.htm.ini deleted file mode 100644 index 682695341c2..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-Npercent.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-1-Npercent.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-auto-shrink.htm.ini deleted file mode 100644 index 1119ac00025..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-auto-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-1-auto-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-auto.htm.ini deleted file mode 100644 index 1d536d55ca0..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-1-auto.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-1-auto.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-N-shrink.htm.ini deleted file mode 100644 index ada6093c62d..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-N-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-N-N-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-N.htm.ini deleted file mode 100644 index c4a56935d67..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-N.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-N-N.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-Npercent-shrink.htm.ini deleted file mode 100644 index c3290d05f9a..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-Npercent-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-N-Npercent-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-Npercent.htm.ini deleted file mode 100644 index 34fc365395b..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-Npercent.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-N-Npercent.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-auto-shrink.htm.ini deleted file mode 100644 index db7766b9f16..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-auto-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-N-auto-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-auto.htm.ini deleted file mode 100644 index 79e6cfcb278..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-N-auto.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-N-auto.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-auto.htm.ini deleted file mode 100644 index 2542d60624e..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-0-auto.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-0-auto.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-0-unitless.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-0-unitless.htm.ini deleted file mode 100644 index 629f0ed1777..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-0-unitless.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-0-0-unitless.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-0.htm.ini deleted file mode 100644 index 5756e83d53b..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-0.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-0-0.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-N-shrink.htm.ini deleted file mode 100644 index d8db8e40c0a..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-N-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-0-N-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-N.htm.ini deleted file mode 100644 index 83087a42ff8..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-N.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-0-N.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-Npercent-shrink.htm.ini deleted file mode 100644 index ad63834cd8c..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-Npercent-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-0-Npercent-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-Npercent.htm.ini deleted file mode 100644 index d6036f30848..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-Npercent.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-0-Npercent.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-auto-shrink.htm.ini deleted file mode 100644 index aa55998d5ef..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-auto-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-0-auto-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-auto.htm.ini deleted file mode 100644 index 4c80b43c1fb..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0-auto.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-0-auto.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0.htm.ini deleted file mode 100644 index bf84279e6ea..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-0.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-0.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-0-unitless.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-0-unitless.htm.ini deleted file mode 100644 index f04a5fac595..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-0-unitless.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-1-0-unitless.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-0.htm.ini deleted file mode 100644 index 365f91127bb..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-0.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-1-0.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-N-shrink.htm.ini deleted file mode 100644 index 527099cf9ed..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-N-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-1-N-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-N.htm.ini deleted file mode 100644 index 6602831954c..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-N.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-1-N.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-Npercent-shrink.htm.ini deleted file mode 100644 index 12dcc655705..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-Npercent-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-1-Npercent-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-Npercent.htm.ini deleted file mode 100644 index c4c1ee7b0a9..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-Npercent.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-1-Npercent.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-auto-shrink.htm.ini deleted file mode 100644 index 7c2d43dac09..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-auto-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-1-auto-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-auto.htm.ini deleted file mode 100644 index 9037d9332cc..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1-auto.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-1-auto.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1.htm.ini deleted file mode 100644 index 2a6c1ef0a55..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-1.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-1.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-0-unitless.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-0-unitless.htm.ini deleted file mode 100644 index a4a0e06dad9..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-0-unitless.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-N-0-unitless.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-0.htm.ini deleted file mode 100644 index b37972216b0..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-0.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-N-0.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-N-shrink.htm.ini deleted file mode 100644 index 163c4e1a92b..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-N-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-N-N-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-N.htm.ini deleted file mode 100644 index fdeb42e10af..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-N.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-N-N.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-Npercent-shrink.htm.ini deleted file mode 100644 index 4b6a0c29735..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-Npercent-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-N-Npercent-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-Npercent.htm.ini deleted file mode 100644 index 8656be71f4f..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-Npercent.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-N-Npercent.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-auto-shrink.htm.ini deleted file mode 100644 index d9acd3f1c14..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-auto-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-N-auto-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-auto.htm.ini deleted file mode 100644 index 826db9b7bd7..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N-auto.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-N-auto.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N.htm.ini deleted file mode 100644 index 0582b6b6c34..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-1-N.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-1-N.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-0-unitless.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-0-unitless.htm.ini deleted file mode 100644 index b161ce67496..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-0-unitless.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-0-0-unitless.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-0.htm.ini deleted file mode 100644 index 93115475067..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-0.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-0-0.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-N-shrink.htm.ini deleted file mode 100644 index 4757195006e..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-N-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-0-N-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-N.htm.ini deleted file mode 100644 index 64d4ddd6d05..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-N.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-0-N.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-Npercent-shrink.htm.ini deleted file mode 100644 index 87756bf1840..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-Npercent-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-0-Npercent-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-Npercent.htm.ini deleted file mode 100644 index 83d2fe4f571..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-Npercent.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-0-Npercent.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-auto-shrink.htm.ini deleted file mode 100644 index 8fa895a7cf5..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-auto-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-0-auto-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-auto.htm.ini deleted file mode 100644 index a7736fbc28a..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0-auto.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-0-auto.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0.htm.ini deleted file mode 100644 index 2f8044035c3..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-0.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-0.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-0-unitless.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-0-unitless.htm.ini deleted file mode 100644 index 0e21928d5d0..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-0-unitless.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-1-0-unitless.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-0.htm.ini deleted file mode 100644 index 339053b156b..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-0.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-1-0.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-N-shrink.htm.ini deleted file mode 100644 index 0d8c15211a0..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-N-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-1-N-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-N.htm.ini deleted file mode 100644 index 9361d5925aa..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-N.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-1-N.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-Npercent-shrink.htm.ini deleted file mode 100644 index 60c66eb7ef1..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-Npercent-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-1-Npercent-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-Npercent.htm.ini deleted file mode 100644 index 0c8ba1aa144..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-Npercent.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-1-Npercent.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-auto-shrink.htm.ini deleted file mode 100644 index 466763eda69..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-auto-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-1-auto-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-auto.htm.ini deleted file mode 100644 index 53b8a6cdbf7..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1-auto.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-1-auto.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1.htm.ini deleted file mode 100644 index c8499e53492..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-1.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-1.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-0-unitless.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-0-unitless.htm.ini deleted file mode 100644 index d058980b605..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-0-unitless.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-N-0-unitless.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-0.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-0.htm.ini deleted file mode 100644 index 9efa39aa7f9..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-0.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-N-0.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-N-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-N-shrink.htm.ini deleted file mode 100644 index 6168a2908c9..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-N-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-N-N-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-N.htm.ini deleted file mode 100644 index 6f55bdf454c..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-N.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-N-N.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-Npercent-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-Npercent-shrink.htm.ini deleted file mode 100644 index d85b0204a7c..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-Npercent-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-N-Npercent-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-Npercent.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-Npercent.htm.ini deleted file mode 100644 index 8e9f14b950c..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-Npercent.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-N-Npercent.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-auto-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-auto-shrink.htm.ini deleted file mode 100644 index 52140d5342e..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-auto-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-N-auto-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-auto.htm.ini deleted file mode 100644 index 28bd2a64a04..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N-auto.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-N-auto.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N.htm.ini deleted file mode 100644 index c91665589e6..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-N-N.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-N-N.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-auto.htm.ini deleted file mode 100644 index dd6f10faa5f..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-auto.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-auto.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-basis-shrink.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-basis-shrink.htm.ini deleted file mode 100644 index 44a529e4ffc..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-basis-shrink.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-basis-shrink.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-basis.htm.ini deleted file mode 100644 index 1f6e9abcf6a..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-basis.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-basis.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-initial-2.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-initial-2.htm.ini deleted file mode 100644 index a41c6caf8d8..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-initial-2.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-initial-2.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-initial.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-initial.htm.ini deleted file mode 100644 index 2250d661273..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-initial.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-initial.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-mixed-basis-auto.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-mixed-basis-auto.htm.ini deleted file mode 100644 index a44166c314c..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-mixed-basis-auto.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-natural-mixed-basis-auto.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-mixed-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-mixed-basis.htm.ini deleted file mode 100644 index 081efd27e41..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-mixed-basis.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-natural-mixed-basis.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-variable-auto-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-variable-auto-basis.htm.ini deleted file mode 100644 index 168ad7b4685..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-variable-auto-basis.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-natural-variable-auto-basis.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-variable-zero-basis.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-variable-zero-basis.htm.ini deleted file mode 100644 index 935e588bfd6..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural-variable-zero-basis.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-natural-variable-zero-basis.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural.htm.ini deleted file mode 100644 index 850870ed2a6..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-natural.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-natural.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-none.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-none.htm.ini deleted file mode 100644 index 9390f510230..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flex-none.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flex-none.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flow-row-wrap-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flow-row-wrap-reverse.htm.ini deleted file mode 100644 index a63111f64f5..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flow-row-wrap-reverse.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flow-row-wrap-reverse.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flow-row-wrap.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flow-row-wrap.htm.ini deleted file mode 100644 index 251bc2bcf7b..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_flow-row-wrap.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_flow-row-wrap.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_item-vertical-align.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_item-vertical-align.htm.ini deleted file mode 100644 index ce7a84ae48a..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_item-vertical-align.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_item-vertical-align.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacearound-only.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacearound-only.htm.ini deleted file mode 100644 index eccc2325909..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacearound-only.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_justifycontent-spacearound-only.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-auto-overflow-2.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-auto-overflow-2.htm.ini deleted file mode 100644 index 4f42ecad4a4..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-auto-overflow-2.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_margin-auto-overflow-2.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-auto-overflow.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-auto-overflow.htm.ini deleted file mode 100644 index 971935e8a0c..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-auto-overflow.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_margin-auto-overflow.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-left-ex.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-left-ex.htm.ini deleted file mode 100644 index f1a8293c048..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_margin-left-ex.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_margin-left-ex.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_order-abspos-space-around.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_order-abspos-space-around.htm.ini deleted file mode 100644 index e4d1a714c78..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_order-abspos-space-around.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_order-abspos-space-around.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_order-box.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_order-box.htm.ini deleted file mode 100644 index b032b8e9eef..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_order-box.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_order-box.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap-long.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap-long.htm.ini deleted file mode 100644 index 0dcbb98d249..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap-long.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_wrap-long.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap-reverse.htm.ini deleted file mode 100644 index d94f03626ad..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap-reverse.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_wrap-reverse.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap.htm.ini deleted file mode 100644 index 2ac9242ab18..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_wrap.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[flexbox_wrap.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-001.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-001.htm.ini deleted file mode 100644 index 8bbb6234137..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-001.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[justify-content-001.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-002.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-002.htm.ini deleted file mode 100644 index 46f575fda25..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-002.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[justify-content-002.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-003.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-003.htm.ini deleted file mode 100644 index 605c363d7a1..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-003.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[justify-content-003.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-004.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-004.htm.ini deleted file mode 100644 index cb5c4edb458..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-004.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[justify-content-004.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-005.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-005.htm.ini deleted file mode 100644 index edbe72ec7a6..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/justify-content-005.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[justify-content-005.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/order-with-row-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/order-with-row-reverse.htm.ini deleted file mode 100644 index 818be990490..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/order-with-row-reverse.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[order-with-row-reverse.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-center.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-center.htm.ini deleted file mode 100644 index 8c1dd22ac1b..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-center.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[ttwf-reftest-flex-align-content-center.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-end.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-end.htm.ini deleted file mode 100644 index a2e05764223..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-end.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[ttwf-reftest-flex-align-content-end.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-space-around.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-space-around.htm.ini deleted file mode 100644 index 7d6c2ff3948..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-space-around.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[ttwf-reftest-flex-align-content-space-around.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-space-between.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-space-between.htm.ini deleted file mode 100644 index fd9758aca44..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-space-between.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[ttwf-reftest-flex-align-content-space-between.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-start.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-start.htm.ini deleted file mode 100644 index 9bc009d1ae8..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-align-content-start.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[ttwf-reftest-flex-align-content-start.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-base.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-base.htm.ini deleted file mode 100644 index 8eb995c7de6..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-base.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[ttwf-reftest-flex-base.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-direction-row-reverse.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-direction-row-reverse.htm.ini deleted file mode 100644 index 647f5e9edb3..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-direction-row-reverse.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[ttwf-reftest-flex-direction-row-reverse.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-order.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-order.htm.ini deleted file mode 100644 index 46d9fbce936..00000000000 --- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/ttwf-reftest-flex-order.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[ttwf-reftest-flex-order.htm] - type: reftest - expected: FAIL