aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/layout_2020/flow/root.rs10
-rw-r--r--components/layout_2020/fragments.rs23
-rw-r--r--components/layout_2020/query.rs203
-rw-r--r--components/layout_thread_2020/lib.rs3
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/abspos/abspos-in-block-in-inline-in-relpos-inline.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-018.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-024.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-027.xht.ini2
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini18
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/auto-margins-root-element.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-margin-left.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-margin-right.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-bottom.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-left.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-right.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-top.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/unresolvable-max-height.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/unresolvable-min-height.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/abspos-descendent-001.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-001.html.ini63
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-002.html.ini9
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-003.html.ini12
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-004.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini1
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-002.html.ini9
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-003.html.ini36
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/box-sizing-001.html.ini21
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/box-sizing-min-max-sizes-001.html.ini7
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/column-flex-child-with-overflow-scroll.html.ini7
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-grid-flex-abspos.html.ini14
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-011.html.ini11
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-column-relayout-assert.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-direction-column-overlap-001.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-factor-less-than-one.html.ini30
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-013.html.ini6
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-compressible-001.html.ini12
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-contains-strict.html.ini12
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-009.html.ini7
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-010.html.ini7
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-size-001.html.ini3
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-outer-flexbox-column-recalculate-height-on-resize-001.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shorthand-flex-basis-middle.html.ini7
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_width-change-and-relayout-children.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/flexitem-no-margin-collapsing.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/height-percentage-with-dynamic-container-size.html.ini7
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001.html.ini36
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001v.html.ini36
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002.html.ini36
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002v.html.ini36
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003.html.ini30
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003v.html.ini30
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004.html.ini9
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004v.html.ini9
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005.html.ini15
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005v.html.ini15
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007.html.ini36
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007v.html.ini36
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/inline-flex.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/justify-content_space-between-002.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/max-width-violation.html.ini3
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/multiline-min-max.html.ini33
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/order_value.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/orthogonal-writing-modes-and-intrinsic-sizing.html.ini7
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-002.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-003.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-004.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-006.html.ini18
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-001.html.ini40
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-003.html.ini3
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-011.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-012.html.ini24
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-013.html.ini6
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-margins-001.html.ini6
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-max-width-cross-axis.html.ini3
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-padding-001.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-quirks-002.html.ini3
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-quirks.html.ini15
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size.html.ini15
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/position-relative-percentage-top-001.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/radiobutton-min-size.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/relayout-align-items.html.ini7
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/relayout-input.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-after-sibling-size-change.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/stretched-child-shrink-on-relayout.html.ini9
-rw-r--r--tests/wpt/metadata-layout-2020/css/css-flexbox/table-with-percent-intrinsic-width.html.ini7
-rw-r--r--tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini85
-rw-r--r--tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-trailing-space-inline.html.ini7
-rw-r--r--tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeftInScrollableParent.html.ini21
-rw-r--r--tests/wpt/metadata-layout-2020/css/cssom-view/table-border-collapse-client-width-height.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/cssom-view/table-border-separate-client-width-height.html.ini4
-rw-r--r--tests/wpt/metadata-layout-2020/css/cssom-view/table-with-border-client-width-height.html.ini4
-rw-r--r--tests/wpt/mozilla/meta-layout-2020/css/offset_properties_inline.html.ini4
92 files changed, 267 insertions, 1045 deletions
diff --git a/components/layout_2020/flow/root.rs b/components/layout_2020/flow/root.rs
index d84c5bc5495..21d99742367 100644
--- a/components/layout_2020/flow/root.rs
+++ b/components/layout_2020/flow/root.rs
@@ -437,17 +437,17 @@ impl FragmentTree {
pub(crate) fn find<T>(
&self,
- mut process_func: impl FnMut(&Fragment, &PhysicalRect<Length>) -> Option<T>,
+ mut process_func: impl FnMut(&Fragment, usize, &PhysicalRect<Length>) -> Option<T>,
) -> Option<T> {
self.root_fragments.iter().find_map(|child| {
child
.borrow()
- .find(&self.initial_containing_block, &mut process_func)
+ .find(&self.initial_containing_block, 0, &mut process_func)
})
}
pub fn remove_nodes_in_fragment_tree_from_set(&self, set: &mut FxHashSet<AnimationSetKey>) {
- self.find(|fragment, _| {
+ self.find(|fragment, _, _| {
let (node, pseudo) = match fragment.tag()? {
Tag::Node(node) => (node, None),
Tag::BeforePseudo(node) => (node, Some(PseudoElement::Before)),
@@ -461,7 +461,7 @@ impl FragmentTree {
pub fn get_content_box_for_node(&self, requested_node: OpaqueNode) -> Rect<Au> {
let mut bounding_box = PhysicalRect::zero();
let tag_to_find = Tag::Node(requested_node);
- self.find(|fragment, containing_block| {
+ self.find(|fragment, _, containing_block| {
if fragment.tag() != Some(tag_to_find) {
return None::<()>;
}
@@ -497,7 +497,7 @@ impl FragmentTree {
}
pub fn get_border_dimensions_for_node(&self, requested_node: OpaqueNode) -> Rect<i32> {
- self.find(|fragment, containing_block| {
+ self.find(|fragment, _, containing_block| {
let (style, padding_rect) = match fragment {
Fragment::Box(fragment) if fragment.tag.node() == requested_node => {
(&fragment.style, fragment.padding_rect())
diff --git a/components/layout_2020/fragments.rs b/components/layout_2020/fragments.rs
index f780ff50d58..73fa57be71e 100644
--- a/components/layout_2020/fragments.rs
+++ b/components/layout_2020/fragments.rs
@@ -227,9 +227,10 @@ impl Fragment {
pub(crate) fn find<T>(
&self,
containing_block: &PhysicalRect<Length>,
- process_func: &mut impl FnMut(&Fragment, &PhysicalRect<Length>) -> Option<T>,
+ level: usize,
+ process_func: &mut impl FnMut(&Fragment, usize, &PhysicalRect<Length>) -> Option<T>,
) -> Option<T> {
- if let Some(result) = process_func(self, containing_block) {
+ if let Some(result) = process_func(self, level, containing_block) {
return Some(result);
}
@@ -239,20 +240,22 @@ impl Fragment {
.content_rect
.to_physical(fragment.style.writing_mode, containing_block)
.translate(containing_block.origin.to_vector());
- fragment
- .children
- .iter()
- .find_map(|child| child.borrow().find(&new_containing_block, process_func))
+ fragment.children.iter().find_map(|child| {
+ child
+ .borrow()
+ .find(&new_containing_block, level + 1, process_func)
+ })
},
Fragment::Anonymous(fragment) => {
let new_containing_block = fragment
.rect
.to_physical(fragment.mode, containing_block)
.translate(containing_block.origin.to_vector());
- fragment
- .children
- .iter()
- .find_map(|child| child.borrow().find(&new_containing_block, process_func))
+ fragment.children.iter().find_map(|child| {
+ child
+ .borrow()
+ .find(&new_containing_block, level + 1, process_func)
+ })
},
_ => None,
}
diff --git a/components/layout_2020/query.rs b/components/layout_2020/query.rs
index 6df2e789e64..efca2e080c1 100644
--- a/components/layout_2020/query.rs
+++ b/components/layout_2020/query.rs
@@ -299,7 +299,7 @@ pub fn process_resolved_style_request<'dom>(
None => return computed_style(),
};
fragment_tree
- .find(|fragment, containing_block| {
+ .find(|fragment, _, containing_block| {
let box_fragment = match fragment {
Fragment::Box(ref box_fragment) if box_fragment.tag == tag_to_find => box_fragment,
_ => return None,
@@ -375,8 +375,205 @@ pub fn process_resolved_style_request_for_unstyled_node<'dom>(
style.computed_value_to_string(PropertyDeclarationId::Longhand(longhand_id))
}
-pub fn process_offset_parent_query(_requested_node: OpaqueNode) -> OffsetParentResponse {
- OffsetParentResponse::empty()
+pub fn process_offset_parent_query(
+ node: OpaqueNode,
+ fragment_tree: Option<Arc<FragmentTree>>,
+) -> OffsetParentResponse {
+ process_offset_parent_query_inner(node, fragment_tree)
+ .unwrap_or_else(OffsetParentResponse::empty)
+}
+
+#[inline]
+fn process_offset_parent_query_inner(
+ node: OpaqueNode,
+ fragment_tree: Option<Arc<FragmentTree>>,
+) -> Option<OffsetParentResponse> {
+ let fragment_tree = fragment_tree?;
+
+ struct NodeOffsetBoxInfo {
+ border_box: Rect<Au>,
+ offset_parent_node_address: Option<OpaqueNode>,
+ }
+
+ // https://www.w3.org/TR/2016/WD-cssom-view-1-20160317/#extensions-to-the-htmlelement-interface
+ let mut parent_node_addresses = Vec::new();
+ let node_offset_box = fragment_tree.find(|fragment, level, containing_block| {
+ // FIXME: Is there a less fragile way of checking whether this
+ // fragment is the body element, rather than just checking that
+ // it's at level 1 (below the root node)?
+ let is_body_element = level == 1;
+
+ if fragment.tag() == Some(Tag::Node(node)) {
+ // Only consider the first fragment of the node found as per a
+ // possible interpretation of the specification: "[...] return the
+ // y-coordinate of the top border edge of the first CSS layout box
+ // associated with the element [...]"
+ //
+ // FIXME: Browsers implement this all differently (e.g., [1]) -
+ // Firefox does returns the union of all layout elements of some
+ // sort. Chrome returns the first fragment for a block element (the
+ // same as ours) or the union of all associated fragments in the
+ // first containing block fragment for an inline element. We could
+ // implement Chrome's behavior, but our fragment tree currently
+ // provides insufficient information.
+ //
+ // [1]: https://github.com/w3c/csswg-drafts/issues/4541
+ let fragment_relative_rect = match fragment {
+ Fragment::Box(fragment) => fragment
+ .border_rect()
+ .to_physical(fragment.style.writing_mode, &containing_block),
+ Fragment::Text(fragment) => fragment
+ .rect
+ .to_physical(fragment.parent_style.writing_mode, &containing_block),
+ Fragment::AbsoluteOrFixedPositioned(_) |
+ Fragment::Image(_) |
+ Fragment::Anonymous(_) => unreachable!(),
+ };
+ let border_box = fragment_relative_rect.translate(containing_block.origin.to_vector());
+
+ let mut border_box = Rect::new(
+ Point2D::new(
+ Au::from_f32_px(border_box.origin.x.px()),
+ Au::from_f32_px(border_box.origin.y.px()),
+ ),
+ Size2D::new(
+ Au::from_f32_px(border_box.size.width.px()),
+ Au::from_f32_px(border_box.size.height.px()),
+ ),
+ );
+
+ // "If any of the following holds true return null and terminate
+ // this algorithm: [...] The element’s computed value of the
+ // `position` property is `fixed`."
+ let is_fixed = match fragment {
+ Fragment::Box(fragment) if fragment.style.get_box().position == Position::Fixed => {
+ true
+ },
+ _ => false,
+ };
+
+ if is_body_element {
+ // "If the element is the HTML body element or [...] return zero
+ // and terminate this algorithm."
+ border_box.origin = Point2D::zero();
+ }
+
+ let offset_parent_node_address = if is_fixed {
+ None
+ } else {
+ // Find the nearest ancestor element eligible as `offsetParent`.
+ parent_node_addresses[..level]
+ .iter()
+ .rev()
+ .cloned()
+ .find_map(std::convert::identity)
+ };
+
+ Some(NodeOffsetBoxInfo {
+ border_box,
+ offset_parent_node_address,
+ })
+ } else {
+ // Record the paths of the nodes being traversed.
+ let parent_node_address = match fragment {
+ Fragment::Box(fragment) => {
+ let is_eligible_parent =
+ match (is_body_element, fragment.style.get_box().position) {
+ // Spec says the element is eligible as `offsetParent` if any of
+ // these are true:
+ // 1) Is the body element
+ // 2) Is static position *and* is a table or table cell
+ // 3) Is not static position
+ // TODO: Handle case 2
+ (true, _) |
+ (false, Position::Absolute) |
+ (false, Position::Relative) |
+ (false, Position::Fixed) => true,
+
+ // Otherwise, it's not a valid parent
+ (false, Position::Static) => false,
+ };
+
+ if let Tag::Node(node_address) = fragment.tag {
+ is_eligible_parent.then(|| node_address)
+ } else {
+ None
+ }
+ },
+ Fragment::AbsoluteOrFixedPositioned(_) |
+ Fragment::Text(_) |
+ Fragment::Image(_) |
+ Fragment::Anonymous(_) => None,
+ };
+
+ while parent_node_addresses.len() <= level {
+ parent_node_addresses.push(None);
+ }
+ parent_node_addresses[level] = parent_node_address;
+ None
+ }
+ });
+
+ // Bail out if the element doesn't have an associated fragment.
+ // "If any of the following holds true return null and terminate this
+ // algorithm: [...] The element does not have an associated CSS layout box."
+ // (`offsetParent`) "If the element is the HTML body element [...] return
+ // zero and terminate this algorithm." (others)
+ let node_offset_box = node_offset_box?;
+
+ let offset_parent_padding_box_corner = node_offset_box
+ .offset_parent_node_address
+ .map(|offset_parent_node_address| {
+ // Find the top and left padding edges of "the first CSS layout box
+ // associated with the `offsetParent` of the element".
+ //
+ // Since we saw `offset_parent_node_address` once, we should be able
+ // to find it again.
+ fragment_tree
+ .find(|fragment, _, containing_block| {
+ match fragment {
+ Fragment::Box(fragment)
+ if fragment.tag == Tag::Node(offset_parent_node_address) =>
+ {
+ // Again, take the *first* associated CSS layout box.
+ let padding_box_corner = fragment
+ .padding_rect()
+ .to_physical(fragment.style.writing_mode, &containing_block)
+ .origin
+ .to_vector() +
+ containing_block.origin.to_vector();
+ let padding_box_corner = Vector2D::new(
+ Au::from_f32_px(padding_box_corner.x.px()),
+ Au::from_f32_px(padding_box_corner.y.px()),
+ );
+ Some(padding_box_corner)
+ }
+ Fragment::AbsoluteOrFixedPositioned(_) |
+ Fragment::Box(_) |
+ Fragment::Text(_) |
+ Fragment::Image(_) |
+ Fragment::Anonymous(_) => None,
+ }
+ })
+ .unwrap()
+ })
+ // "If the offsetParent of the element is null," subtract zero in the
+ // following step.
+ .unwrap_or(Vector2D::zero());
+
+ Some(OffsetParentResponse {
+ node_address: node_offset_box.offset_parent_node_address.map(Into::into),
+ // "Return the result of subtracting the x-coordinate of the left
+ // padding edge of the first CSS layout box associated with the
+ // `offsetParent` of the element from the x-coordinate of the left
+ // border edge of the first CSS layout box associated with the element,
+ // relative to the initial containing block origin, ignoring any
+ // transforms that apply to the element and its ancestors." (and vice
+ // versa for the top border edge)
+ rect: node_offset_box
+ .border_box
+ .translate(-offset_parent_padding_box_corner),
+ })
}
// https://html.spec.whatwg.org/multipage/#the-innertext-idl-attribute
diff --git a/components/layout_thread_2020/lib.rs b/components/layout_thread_2020/lib.rs
index 6b32a44a5b4..60aa8c7b0c1 100644
--- a/components/layout_thread_2020/lib.rs
+++ b/components/layout_thread_2020/lib.rs
@@ -1212,7 +1212,8 @@ impl LayoutThread {
process_resolved_font_style_query(node, property, value);
},
&QueryMsg::OffsetParentQuery(node) => {
- rw_data.offset_parent_response = process_offset_parent_query(node);
+ rw_data.offset_parent_response =
+ process_offset_parent_query(node, self.fragment_tree.borrow().clone());
},
&QueryMsg::StyleQuery => {},
&QueryMsg::NodesFromPointQuery(client_point, ref reflow_goal) => {
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/abspos/abspos-in-block-in-inline-in-relpos-inline.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/abspos/abspos-in-block-in-inline-in-relpos-inline.html.ini
new file mode 100644
index 00000000000..e2a3f510865
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/abspos/abspos-in-block-in-inline-in-relpos-inline.html.ini
@@ -0,0 +1,4 @@
+[abspos-in-block-in-inline-in-relpos-inline.html]
+ [position:absolute should be sized by the right ancestor]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-018.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-018.xht.ini
new file mode 100644
index 00000000000..27f65ceefa2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-018.xht.ini
@@ -0,0 +1,2 @@
+[margin-collapse-018.xht]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-024.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-024.xht.ini
new file mode 100644
index 00000000000..3773be28d89
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-024.xht.ini
@@ -0,0 +1,2 @@
+[margin-collapse-024.xht]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-027.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-027.xht.ini
new file mode 100644
index 00000000000..519aa8a80eb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-027.xht.ini
@@ -0,0 +1,2 @@
+[margin-collapse-027.xht]
+ expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
index e9755201107..aaa6b338c85 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -1,25 +1,7 @@
[inline-negative-margin-001.html]
- [[data-expected-height\] 3]
- expected: FAIL
-
[[data-expected-height\] 7]
expected: FAIL
- [[data-expected-height\] 4]
- expected: FAIL
-
- [[data-expected-height\] 1]
- expected: FAIL
-
- [[data-expected-height\] 2]
- expected: FAIL
-
- [[data-expected-height\] 5]
- expected: FAIL
-
- [[data-expected-height\] 6]
- expected: FAIL
-
[[data-expected-height\] 8]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/auto-margins-root-element.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/auto-margins-root-element.html.ini
deleted file mode 100644
index df82a7feae2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/auto-margins-root-element.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[auto-margins-root-element.html]
- [Root element auto margins resolve]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-margin-left.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-margin-left.html.ini
deleted file mode 100644
index f6567edc05f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-margin-left.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[containing-block-percent-margin-left.html]
- [#container 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-margin-right.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-margin-right.html.ini
deleted file mode 100644
index 98d5997441d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-margin-right.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[containing-block-percent-margin-right.html]
- [#container 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-bottom.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-bottom.html.ini
deleted file mode 100644
index ae23839ee75..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-bottom.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[containing-block-percent-padding-bottom.html]
- [#container 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-left.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-left.html.ini
deleted file mode 100644
index 81e8730905f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-left.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[containing-block-percent-padding-left.html]
- [#container 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-right.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-right.html.ini
deleted file mode 100644
index 56606b18ab5..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-right.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[containing-block-percent-padding-right.html]
- [#container 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-top.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-top.html.ini
deleted file mode 100644
index 99bda1e6c8d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/containing-block-percent-padding-top.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[containing-block-percent-padding-top.html]
- [#container 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/unresolvable-max-height.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/unresolvable-max-height.html.ini
deleted file mode 100644
index 1ecf647d659..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/unresolvable-max-height.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[unresolvable-max-height.html]
- [#container 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/unresolvable-min-height.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/unresolvable-min-height.html.ini
deleted file mode 100644
index 1b6bb0de230..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/unresolvable-min-height.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[unresolvable-min-height.html]
- [#container 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/abspos-descendent-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/abspos-descendent-001.html.ini
deleted file mode 100644
index c7ab3aaec53..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/abspos-descendent-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abspos-descendent-001.html]
- [.flexbox 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-001.html.ini
index ff646d65345..1c4ab46ade2 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-001.html.ini
@@ -44,9 +44,6 @@
[.flexbox 85]
expected: FAIL
- [.flexbox 87]
- expected: FAIL
-
[.flexbox 86]
expected: FAIL
@@ -68,9 +65,6 @@
[.flexbox 10]
expected: FAIL
- [.flexbox 109]
- expected: FAIL
-
[.flexbox 18]
expected: FAIL
@@ -107,9 +101,6 @@
[.flexbox 107]
expected: FAIL
- [.flexbox 106]
- expected: FAIL
-
[.flexbox 63]
expected: FAIL
@@ -242,9 +233,6 @@
[.flexbox 6]
expected: FAIL
- [.flexbox 7]
- expected: FAIL
-
[.flexbox 2]
expected: FAIL
@@ -284,18 +272,12 @@
[.flexbox 55]
expected: FAIL
- [.flexbox 29]
- expected: FAIL
-
[.flexbox 28]
expected: FAIL
[.flexbox 27]
expected: FAIL
- [.flexbox 26]
- expected: FAIL
-
[.flexbox 25]
expected: FAIL
@@ -314,48 +296,3 @@
[.flexbox 120]
expected: FAIL
- [.flexbox 1]
- expected: FAIL
-
- [.flexbox 4]
- expected: FAIL
-
- [.flexbox 11]
- expected: FAIL
-
- [.flexbox 14]
- expected: FAIL
-
- [.flexbox 22]
- expected: FAIL
-
- [.flexbox 32]
- expected: FAIL
-
- [.flexbox 52]
- expected: FAIL
-
- [.flexbox 71]
- expected: FAIL
-
- [.flexbox 74]
- expected: FAIL
-
- [.flexbox 81]
- expected: FAIL
-
- [.flexbox 84]
- expected: FAIL
-
- [.flexbox 91]
- expected: FAIL
-
- [.flexbox 94]
- expected: FAIL
-
- [.flexbox 102]
- expected: FAIL
-
- [.flexbox 112]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-002.html.ini
index d7108fac0cf..53be9e59fff 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-002.html.ini
@@ -5,12 +5,6 @@
[.flexbox 4]
expected: FAIL
- [.flexbox 6]
- expected: FAIL
-
- [.flexbox 7]
- expected: FAIL
-
[.flexbox 3]
expected: FAIL
@@ -23,6 +17,3 @@
[.flexbox 9]
expected: FAIL
- [.flexbox 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-003.html.ini
index 0a8dcb053e7..8b79c6dcfbd 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-003.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-003.html.ini
@@ -17,18 +17,6 @@
[.rect 5]
expected: FAIL
- [.rect 4]
- expected: FAIL
-
- [.rect 3]
- expected: FAIL
-
- [.rect 2]
- expected: FAIL
-
- [.rect 1]
- expected: FAIL
-
[.rect 14]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-004.html.ini
deleted file mode 100644
index 195e514a68b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[position-absolute-004.html]
- [#flex 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini
index f85c833dc81..e32da21630a 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/abspos/position-absolute-013.html.ini
@@ -1,5 +1,4 @@
[position-absolute-013.html]
- expected: TIMEOUT
[.flexbox 309]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-002.html.ini
index a4460da83b9..92687182357 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-002.html.ini
@@ -1,13 +1,4 @@
[align-content-wrap-002.html]
- [.flex-horizontal, .flex-vertical 1]
- expected: FAIL
-
- [.flex-horizontal, .flex-vertical 2]
- expected: FAIL
-
- [.flex-horizontal, .flex-vertical 3]
- expected: FAIL
-
[.flex-horizontal, .flex-vertical 4]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-003.html.ini
index 599540c2d07..a2028ef2a81 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-003.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-003.html.ini
@@ -1,7 +1,4 @@
[align-content-wrap-003.html]
- [.flexbox 37]
- expected: FAIL
-
[.flexbox 4]
expected: FAIL
@@ -17,9 +14,6 @@
[.flexbox 1]
expected: FAIL
- [.flexbox 2]
- expected: FAIL
-
[.flexbox 3]
expected: FAIL
@@ -32,18 +26,6 @@
[.flexbox 9]
expected: FAIL
- [.flexbox 16]
- expected: FAIL
-
- [.flexbox 17]
- expected: FAIL
-
- [.flexbox 14]
- expected: FAIL
-
- [.flexbox 15]
- expected: FAIL
-
[.flexbox 12]
expected: FAIL
@@ -53,9 +35,6 @@
[.flexbox 10]
expected: FAIL
- [.flexbox 11]
- expected: FAIL
-
[.flexbox 34]
expected: FAIL
@@ -74,18 +53,6 @@
[.flexbox 31]
expected: FAIL
- [.flexbox 18]
- expected: FAIL
-
- [.flexbox 19]
- expected: FAIL
-
- [.flexbox 38]
- expected: FAIL
-
- [.flexbox 39]
- expected: FAIL
-
[.flexbox 29]
expected: FAIL
@@ -122,9 +89,6 @@
[.flexbox 41]
expected: FAIL
- [.flexbox 40]
- expected: FAIL
-
[.flexbox 43]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/box-sizing-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/box-sizing-001.html.ini
index f56619799ec..ef0e4418a51 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/box-sizing-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/box-sizing-001.html.ini
@@ -2,30 +2,9 @@
[.flexbox 10]
expected: FAIL
- [.flexbox 4]
- expected: FAIL
-
[.flexbox 8]
expected: FAIL
[.flexbox 9]
expected: FAIL
- [.flexbox 5]
- expected: FAIL
-
- [.flexbox 6]
- expected: FAIL
-
- [.flexbox 7]
- expected: FAIL
-
- [.flexbox 1]
- expected: FAIL
-
- [.flexbox 2]
- expected: FAIL
-
- [.flexbox 3]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/box-sizing-min-max-sizes-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/box-sizing-min-max-sizes-001.html.ini
deleted file mode 100644
index c41a8c9bea2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/box-sizing-min-max-sizes-001.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[box-sizing-min-max-sizes-001.html]
- [.flexbox 1]
- expected: FAIL
-
- [.flexbox 2]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/column-flex-child-with-overflow-scroll.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/column-flex-child-with-overflow-scroll.html.ini
deleted file mode 100644
index 6f96820248c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/column-flex-child-with-overflow-scroll.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[column-flex-child-with-overflow-scroll.html]
- [.flexbox 1]
- expected: FAIL
-
- [.flexbox 2]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-grid-flex-abspos.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-grid-flex-abspos.html.ini
index 5635828ae04..6205691956d 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-grid-flex-abspos.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-grid-flex-abspos.html.ini
@@ -1,17 +1,7 @@
[dynamic-grid-flex-abspos.html]
- [.relpos 1]
- expected: FAIL
- [.relpos 2]
- expected: FAIL
- [.relpos 3]
- expected: FAIL
[.relpos 4]
expected: FAIL
- [.relpos 5]
- expected: FAIL
- [.relpos 6]
- expected: FAIL
- [.relpos 7]
- expected: FAIL
+
[.relpos 8]
expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-011.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-011.html.ini
index 9f04cf4e1d0..33556f29dc0 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-011.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-011.html.ini
@@ -8,15 +8,6 @@
[.flexbox 7]
expected: FAIL
- [.flexbox 2]
- expected: FAIL
-
- [.flexbox 8]
- expected: FAIL
-
- [.flexbox 4]
- expected: FAIL
-
[.flexbox 6]
expected: FAIL
@@ -26,5 +17,3 @@
[.flexbox 3]
expected: FAIL
- [.flexbox 9]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-column-relayout-assert.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-column-relayout-assert.html.ini
deleted file mode 100644
index 18ebd124a68..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-column-relayout-assert.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flex-column-relayout-assert.html]
- [.flexbox 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-direction-column-overlap-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-direction-column-overlap-001.html.ini
deleted file mode 100644
index 37034a46aa5..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-direction-column-overlap-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flex-direction-column-overlap-001.html]
- [#container 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-factor-less-than-one.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-factor-less-than-one.html.ini
index 6e2f78feab2..defb8a8273c 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-factor-less-than-one.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-factor-less-than-one.html.ini
@@ -1,7 +1,4 @@
[flex-factor-less-than-one.html]
- [.flexbox 4]
- expected: FAIL
-
[.flexbox 5]
expected: FAIL
@@ -14,9 +11,6 @@
[.flexbox 8]
expected: FAIL
- [.flexbox 9]
- expected: FAIL
-
[.flexbox 16]
expected: FAIL
@@ -29,12 +23,6 @@
[.flexbox 12]
expected: FAIL
- [.flexbox 13]
- expected: FAIL
-
- [.flexbox 18]
- expected: FAIL
-
[.flexbox 19]
expected: FAIL
@@ -47,21 +35,3 @@
[.flexbox 20]
expected: FAIL
- [.flexbox 6]
- expected: FAIL
-
- [.flexbox 1]
- expected: FAIL
-
- [.flexbox 2]
- expected: FAIL
-
- [.flexbox 15]
- expected: FAIL
-
- [.flexbox 10]
- expected: FAIL
-
- [.flexbox 11]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-013.html.ini
index 3fb0c04e822..6d1984e7d82 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-013.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flow-013.html.ini
@@ -2,9 +2,6 @@
[.flexbox 12]
expected: FAIL
- [.flexbox 10]
- expected: FAIL
-
[.flexbox 11]
expected: FAIL
@@ -26,9 +23,6 @@
[.flexbox 8]
expected: FAIL
- [.flexbox 9]
- expected: FAIL
-
[.flexbox 1]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-compressible-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-compressible-001.html.ini
index 87512f70ba7..c2a1d9ba1e1 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-compressible-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-compressible-001.html.ini
@@ -1,16 +1,4 @@
[flex-item-compressible-001.html]
- [.flexbox 1]
- expected: FAIL
-
- [.flexbox 2]
- expected: FAIL
-
- [.flexbox 6]
- expected: FAIL
-
- [.flexbox 7]
- expected: FAIL
-
[.flexbox 14]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-contains-strict.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-contains-strict.html.ini
index 260e384ebbd..95a48442ec2 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-contains-strict.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-contains-strict.html.ini
@@ -11,3 +11,15 @@
[.inline-flex 8]
expected: FAIL
+ [.inline-flex 1]
+ expected: FAIL
+
+ [.inline-flex 2]
+ expected: FAIL
+
+ [.inline-flex 5]
+ expected: FAIL
+
+ [.inline-flex 6]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-009.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-009.html.ini
deleted file mode 100644
index c13515644a2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-009.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[flex-minimum-height-flex-items-009.html]
- [.container 2]
- expected: FAIL
-
- [.container 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-010.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-010.html.ini
deleted file mode 100644
index ffe22ce6e37..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-010.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[flex-minimum-height-flex-items-010.html]
- [.container 2]
- expected: FAIL
-
- [.container 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-size-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-size-001.html.ini
index f51bbfd4a15..e1788a14dcd 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-size-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-size-001.html.ini
@@ -11,9 +11,6 @@
[.flexbox, .inline-flexbox 4]
expected: FAIL
- [.flexbox, .inline-flexbox 3]
- expected: FAIL
-
[.flexbox, .inline-flexbox 2]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-outer-flexbox-column-recalculate-height-on-resize-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-outer-flexbox-column-recalculate-height-on-resize-001.html.ini
deleted file mode 100644
index 732e9591a8b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-outer-flexbox-column-recalculate-height-on-resize-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flex-outer-flexbox-column-recalculate-height-on-resize-001.html]
- [.OuterFlexbox 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shorthand-flex-basis-middle.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shorthand-flex-basis-middle.html.ini
deleted file mode 100644
index 2214c175cf1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-shorthand-flex-basis-middle.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[flex-shorthand-flex-basis-middle.html]
- [.flexbox 1]
- expected: FAIL
-
- [.flexbox 2]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_width-change-and-relayout-children.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_width-change-and-relayout-children.html.ini
deleted file mode 100644
index cc68923b9a6..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_width-change-and-relayout-children.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_width-change-and-relayout-children.html]
- [#container 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexitem-no-margin-collapsing.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexitem-no-margin-collapsing.html.ini
deleted file mode 100644
index a5778572378..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexitem-no-margin-collapsing.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexitem-no-margin-collapsing.html]
- [.flexbox 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/height-percentage-with-dynamic-container-size.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/height-percentage-with-dynamic-container-size.html.ini
deleted file mode 100644
index 0980a59dcea..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/height-percentage-with-dynamic-container-size.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[height-percentage-with-dynamic-container-size.html]
- [.container 1]
- expected: FAIL
- [.container 2]
- expected: FAIL
- [.container 3]
- expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001.html.ini
index aff9924e070..129cb7707e5 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001.html.ini
@@ -1,55 +1,19 @@
[image-as-flexitem-size-001.html]
- [.flexbox > img 1]
- expected: FAIL
-
- [.flexbox > img 2]
- expected: FAIL
-
[.flexbox > img 3]
expected: FAIL
[.flexbox > img 4]
expected: FAIL
- [.flexbox > img 5]
- expected: FAIL
-
[.flexbox > img 6]
expected: FAIL
[.flexbox > img 7]
expected: FAIL
- [.flexbox > img 8]
- expected: FAIL
-
- [.flexbox > img 9]
- expected: FAIL
-
[.flexbox > img 10]
expected: FAIL
[.flexbox > img 11]
expected: FAIL
- [.flexbox > img 12]
- expected: FAIL
-
- [.flexbox > img 13]
- expected: FAIL
-
- [.flexbox > img 14]
- expected: FAIL
-
- [.flexbox > img 15]
- expected: FAIL
-
- [.flexbox > img 16]
- expected: FAIL
-
- [.flexbox > img 17]
- expected: FAIL
-
- [.flexbox > img 18]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001v.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001v.html.ini
index 7bcce7c1aef..c8133704c22 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001v.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-001v.html.ini
@@ -2,54 +2,18 @@
[.flexbox > img 4]
expected: FAIL
- [.flexbox > img 15]
- expected: FAIL
-
- [.flexbox > img 14]
- expected: FAIL
-
- [.flexbox > img 17]
- expected: FAIL
-
- [.flexbox > img 16]
- expected: FAIL
-
[.flexbox > img 11]
expected: FAIL
[.flexbox > img 10]
expected: FAIL
- [.flexbox > img 13]
- expected: FAIL
-
- [.flexbox > img 12]
- expected: FAIL
-
- [.flexbox > img 18]
- expected: FAIL
-
- [.flexbox > img 9]
- expected: FAIL
-
- [.flexbox > img 8]
- expected: FAIL
-
- [.flexbox > img 5]
- expected: FAIL
-
[.flexbox > img 7]
expected: FAIL
[.flexbox > img 6]
expected: FAIL
- [.flexbox > img 1]
- expected: FAIL
-
[.flexbox > img 3]
expected: FAIL
- [.flexbox > img 2]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002.html.ini
index 5fcdf0ffab5..18057c80008 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002.html.ini
@@ -2,54 +2,18 @@
[.flexbox > img 4]
expected: FAIL
- [.flexbox > img 15]
- expected: FAIL
-
- [.flexbox > img 14]
- expected: FAIL
-
- [.flexbox > img 17]
- expected: FAIL
-
- [.flexbox > img 16]
- expected: FAIL
-
[.flexbox > img 11]
expected: FAIL
[.flexbox > img 10]
expected: FAIL
- [.flexbox > img 13]
- expected: FAIL
-
- [.flexbox > img 12]
- expected: FAIL
-
- [.flexbox > img 18]
- expected: FAIL
-
- [.flexbox > img 9]
- expected: FAIL
-
- [.flexbox > img 8]
- expected: FAIL
-
- [.flexbox > img 5]
- expected: FAIL
-
[.flexbox > img 7]
expected: FAIL
[.flexbox > img 6]
expected: FAIL
- [.flexbox > img 1]
- expected: FAIL
-
[.flexbox > img 3]
expected: FAIL
- [.flexbox > img 2]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002v.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002v.html.ini
index 0a719724afe..2d3d5f4800f 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002v.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-002v.html.ini
@@ -2,54 +2,18 @@
[.flexbox > img 4]
expected: FAIL
- [.flexbox > img 15]
- expected: FAIL
-
- [.flexbox > img 14]
- expected: FAIL
-
- [.flexbox > img 17]
- expected: FAIL
-
- [.flexbox > img 16]
- expected: FAIL
-
[.flexbox > img 11]
expected: FAIL
[.flexbox > img 10]
expected: FAIL
- [.flexbox > img 13]
- expected: FAIL
-
- [.flexbox > img 12]
- expected: FAIL
-
- [.flexbox > img 18]
- expected: FAIL
-
- [.flexbox > img 9]
- expected: FAIL
-
- [.flexbox > img 8]
- expected: FAIL
-
- [.flexbox > img 5]
- expected: FAIL
-
[.flexbox > img 7]
expected: FAIL
[.flexbox > img 6]
expected: FAIL
- [.flexbox > img 1]
- expected: FAIL
-
[.flexbox > img 3]
expected: FAIL
- [.flexbox > img 2]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003.html.ini
index 727505695ec..b65663944d5 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003.html.ini
@@ -14,42 +14,12 @@
[.flexbox > img 8]
expected: FAIL
- [.flexbox > img 16]
- expected: FAIL
-
[.flexbox > img 11]
expected: FAIL
[.flexbox > img 10]
expected: FAIL
- [.flexbox > img 13]
- expected: FAIL
-
- [.flexbox > img 12]
- expected: FAIL
-
- [.flexbox > img 4]
- expected: FAIL
-
- [.flexbox > img 15]
- expected: FAIL
-
- [.flexbox > img 14]
- expected: FAIL
-
- [.flexbox > img 17]
- expected: FAIL
-
- [.flexbox > img 18]
- expected: FAIL
-
- [.flexbox > img 9]
- expected: FAIL
-
[.flexbox > img 3]
expected: FAIL
- [.flexbox > img 2]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003v.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003v.html.ini
index a84fad8ab0a..9c181a42b99 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003v.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-003v.html.ini
@@ -14,42 +14,12 @@
[.flexbox > img 8]
expected: FAIL
- [.flexbox > img 16]
- expected: FAIL
-
[.flexbox > img 11]
expected: FAIL
[.flexbox > img 10]
expected: FAIL
- [.flexbox > img 13]
- expected: FAIL
-
- [.flexbox > img 12]
- expected: FAIL
-
- [.flexbox > img 4]
- expected: FAIL
-
- [.flexbox > img 15]
- expected: FAIL
-
- [.flexbox > img 14]
- expected: FAIL
-
- [.flexbox > img 17]
- expected: FAIL
-
- [.flexbox > img 18]
- expected: FAIL
-
- [.flexbox > img 9]
- expected: FAIL
-
[.flexbox > img 3]
expected: FAIL
- [.flexbox > img 2]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004.html.ini
index 0420f1387fa..e996902e291 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004.html.ini
@@ -2,9 +2,6 @@
[.flexbox > img 15]
expected: FAIL
- [.flexbox > img 11]
- expected: FAIL
-
[.flexbox > img 10]
expected: FAIL
@@ -35,12 +32,6 @@
[.flexbox > img 14]
expected: FAIL
- [.flexbox > img 17]
- expected: FAIL
-
- [.flexbox > img 16]
- expected: FAIL
-
[.flexbox > img 12]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004v.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004v.html.ini
index 87ad848b1e9..33189abc79d 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004v.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-004v.html.ini
@@ -2,9 +2,6 @@
[.flexbox > img 15]
expected: FAIL
- [.flexbox > img 11]
- expected: FAIL
-
[.flexbox > img 10]
expected: FAIL
@@ -35,12 +32,6 @@
[.flexbox > img 14]
expected: FAIL
- [.flexbox > img 17]
- expected: FAIL
-
- [.flexbox > img 16]
- expected: FAIL
-
[.flexbox > img 12]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005.html.ini
index d9323a568f4..48bb487dc1e 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005.html.ini
@@ -1,19 +1,7 @@
[image-as-flexitem-size-005.html]
- [.flexbox > img 15]
- expected: FAIL
-
- [.flexbox > img 16]
- expected: FAIL
-
[.flexbox > img 11]
expected: FAIL
- [.flexbox > img 10]
- expected: FAIL
-
- [.flexbox > img 13]
- expected: FAIL
-
[.flexbox > img 18]
expected: FAIL
@@ -35,9 +23,6 @@
[.flexbox > img 1]
expected: FAIL
- [.flexbox > img 3]
- expected: FAIL
-
[.flexbox > img 2]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005v.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005v.html.ini
index 991f4186279..c8c26ba110d 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005v.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-005v.html.ini
@@ -11,21 +11,9 @@
[.flexbox > img 17]
expected: FAIL
- [.flexbox > img 15]
- expected: FAIL
-
- [.flexbox > img 16]
- expected: FAIL
-
[.flexbox > img 11]
expected: FAIL
- [.flexbox > img 10]
- expected: FAIL
-
- [.flexbox > img 13]
- expected: FAIL
-
[.flexbox > img 18]
expected: FAIL
@@ -47,9 +35,6 @@
[.flexbox > img 1]
expected: FAIL
- [.flexbox > img 3]
- expected: FAIL
-
[.flexbox > img 2]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007.html.ini
index d6a66ba2c91..46f0cfb6cb8 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007.html.ini
@@ -1,55 +1,19 @@
[image-as-flexitem-size-007.html]
- [.flexbox > img 1]
- expected: FAIL
-
- [.flexbox > img 2]
- expected: FAIL
-
[.flexbox > img 3]
expected: FAIL
[.flexbox > img 4]
expected: FAIL
- [.flexbox > img 5]
- expected: FAIL
-
[.flexbox > img 6]
expected: FAIL
[.flexbox > img 7]
expected: FAIL
- [.flexbox > img 8]
- expected: FAIL
-
- [.flexbox > img 9]
- expected: FAIL
-
[.flexbox > img 10]
expected: FAIL
[.flexbox > img 11]
expected: FAIL
- [.flexbox > img 12]
- expected: FAIL
-
- [.flexbox > img 13]
- expected: FAIL
-
- [.flexbox > img 14]
- expected: FAIL
-
- [.flexbox > img 15]
- expected: FAIL
-
- [.flexbox > img 16]
- expected: FAIL
-
- [.flexbox > img 17]
- expected: FAIL
-
- [.flexbox > img 18]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007v.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007v.html.ini
index 0e2bee75827..4b205babbfc 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007v.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-as-flexitem-size-007v.html.ini
@@ -2,54 +2,18 @@
[.flexbox > img 4]
expected: FAIL
- [.flexbox > img 15]
- expected: FAIL
-
- [.flexbox > img 14]
- expected: FAIL
-
- [.flexbox > img 17]
- expected: FAIL
-
- [.flexbox > img 16]
- expected: FAIL
-
[.flexbox > img 11]
expected: FAIL
[.flexbox > img 10]
expected: FAIL
- [.flexbox > img 13]
- expected: FAIL
-
- [.flexbox > img 12]
- expected: FAIL
-
- [.flexbox > img 18]
- expected: FAIL
-
- [.flexbox > img 9]
- expected: FAIL
-
- [.flexbox > img 8]
- expected: FAIL
-
- [.flexbox > img 5]
- expected: FAIL
-
[.flexbox > img 7]
expected: FAIL
[.flexbox > img 6]
expected: FAIL
- [.flexbox > img 1]
- expected: FAIL
-
[.flexbox > img 3]
expected: FAIL
- [.flexbox > img 2]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/inline-flex.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/inline-flex.html.ini
deleted file mode 100644
index e339b2a916b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/inline-flex.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[inline-flex.html]
- [#testcase 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/justify-content_space-between-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/justify-content_space-between-002.html.ini
deleted file mode 100644
index f4fd1c942f9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/justify-content_space-between-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[justify-content_space-between-002.html]
- [.flexbox 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/max-width-violation.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/max-width-violation.html.ini
index 21800d6782f..527e2238cca 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/max-width-violation.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/max-width-violation.html.ini
@@ -1,7 +1,4 @@
[max-width-violation.html]
- [.columns 1]
- expected: FAIL
-
[.columns 2]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/multiline-min-max.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/multiline-min-max.html.ini
index 829e0e13737..e27f8f3bb54 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/multiline-min-max.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/multiline-min-max.html.ini
@@ -1,43 +1,10 @@
[multiline-min-max.html]
- [.flexbox 14]
- expected: FAIL
-
[.flexbox 12]
expected: FAIL
[.flexbox 13]
expected: FAIL
- [.flexbox 10]
- expected: FAIL
-
- [.flexbox 11]
- expected: FAIL
-
- [.flexbox 4]
- expected: FAIL
-
[.flexbox 5]
expected: FAIL
- [.flexbox 6]
- expected: FAIL
-
- [.flexbox 7]
- expected: FAIL
-
- [.flexbox 1]
- expected: FAIL
-
- [.flexbox 2]
- expected: FAIL
-
- [.flexbox 3]
- expected: FAIL
-
- [.flexbox 8]
- expected: FAIL
-
- [.flexbox 9]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/order_value.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/order_value.html.ini
deleted file mode 100644
index 76af0158808..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/order_value.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[order_value.html]
- [CSS Flexible Box Test: order_check]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/orthogonal-writing-modes-and-intrinsic-sizing.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/orthogonal-writing-modes-and-intrinsic-sizing.html.ini
deleted file mode 100644
index c77fb2bbfbf..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/orthogonal-writing-modes-and-intrinsic-sizing.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[orthogonal-writing-modes-and-intrinsic-sizing.html]
- [.flexbox 2]
- expected: FAIL
-
- [.flexbox 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-002.html.ini
deleted file mode 100644
index f8be2dc573b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-auto-002.html]
- [section 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-003.html.ini
deleted file mode 100644
index 95128ca0569..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-auto-003.html]
- [.flexbox 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-004.html.ini
deleted file mode 100644
index d7846b77a57..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-auto-004.html]
- [#list-wrapper 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-006.html.ini
index 8d018f57eb8..adb98201ac0 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-006.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-006.html.ini
@@ -2,27 +2,9 @@
[.flexbox, .inline-flexbox 10]
expected: FAIL
- [.flexbox, .inline-flexbox 3]
- expected: FAIL
-
- [.flexbox, .inline-flexbox 2]
- expected: FAIL
-
- [.flexbox, .inline-flexbox 1]
- expected: FAIL
-
[.flexbox, .inline-flexbox 7]
expected: FAIL
- [.flexbox, .inline-flexbox 6]
- expected: FAIL
-
- [.flexbox, .inline-flexbox 5]
- expected: FAIL
-
- [.flexbox, .inline-flexbox 4]
- expected: FAIL
-
[.flexbox, .inline-flexbox 9]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-001.html.ini
deleted file mode 100644
index d834b0d9792..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-001.html.ini
+++ /dev/null
@@ -1,40 +0,0 @@
-[percentage-heights-001.html]
- [.flexbox 12]
- expected: FAIL
-
- [.flexbox 13]
- expected: FAIL
-
- [.flexbox 10]
- expected: FAIL
-
- [.flexbox 11]
- expected: FAIL
-
- [.flexbox 4]
- expected: FAIL
-
- [.flexbox 5]
- expected: FAIL
-
- [.flexbox 6]
- expected: FAIL
-
- [.flexbox 7]
- expected: FAIL
-
- [.flexbox 1]
- expected: FAIL
-
- [.flexbox 2]
- expected: FAIL
-
- [.flexbox 3]
- expected: FAIL
-
- [.flexbox 8]
- expected: FAIL
-
- [.flexbox 9]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-003.html.ini
index 6c2d425731a..dee89160b90 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-003.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-003.html.ini
@@ -5,9 +5,6 @@
[.flexbox 7]
expected: FAIL
- [.flexbox 1]
- expected: FAIL
-
[.flexbox 2]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-011.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-011.html.ini
deleted file mode 100644
index 8305f57f9e6..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-011.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[percentage-heights-011.html]
- [#outer 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-012.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-012.html.ini
index 1b500ec0cfe..5a06db5e377 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-012.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-012.html.ini
@@ -1,31 +1,7 @@
[percentage-heights-012.html]
- [.flexbox 4]
- expected: FAIL
-
- [.flexbox 5]
- expected: FAIL
-
- [.flexbox 1]
- expected: FAIL
-
- [.flexbox 2]
- expected: FAIL
-
- [.flexbox 3]
- expected: FAIL
-
[.flexbox 9]
expected: FAIL
[.flexbox 10]
expected: FAIL
- [.flexbox 6]
- expected: FAIL
-
- [.flexbox 7]
- expected: FAIL
-
- [.flexbox 8]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-013.html.ini
index 4da9c87d072..ef77f0bfc37 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-013.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-013.html.ini
@@ -2,12 +2,6 @@
[.flexbox 4]
expected: FAIL
- [.flexbox 1]
- expected: FAIL
-
- [.flexbox 2]
- expected: FAIL
-
[.flexbox 3]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-margins-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-margins-001.html.ini
index e04c970f9c4..2527dc22c4b 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-margins-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-margins-001.html.ini
@@ -2,9 +2,3 @@
[.flexbox 1]
expected: FAIL
- [.flexbox 2]
- expected: FAIL
-
- [.flexbox 3]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-max-width-cross-axis.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-max-width-cross-axis.html.ini
index 3067921b09d..239acf7b8c3 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-max-width-cross-axis.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-max-width-cross-axis.html.ini
@@ -1,7 +1,4 @@
[percentage-max-width-cross-axis.html]
- [.flexbox 1]
- expected: FAIL
-
[.flexbox 2]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-padding-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-padding-001.html.ini
deleted file mode 100644
index f1e1300330e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-padding-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[percentage-padding-001.html]
- [x-flexbox 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-quirks-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-quirks-002.html.ini
index 255dcc3461c..bead7ca2de9 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-quirks-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-quirks-002.html.ini
@@ -1,7 +1,4 @@
[percentage-size-quirks-002.html]
- [.pct 1]
- expected: FAIL
-
[.pct 2]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-quirks.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-quirks.html.ini
index a491f9b8bb8..018966fe83e 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-quirks.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-quirks.html.ini
@@ -2,21 +2,6 @@
[.flexbox 8]
expected: FAIL
- [.flexbox 4]
- expected: FAIL
-
- [.flexbox 5]
- expected: FAIL
-
- [.flexbox 7]
- expected: FAIL
-
- [.flexbox 1]
- expected: FAIL
-
- [.flexbox 2]
- expected: FAIL
-
[.flexbox 3]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size.html.ini
index 20a191bf860..e863ea50b6a 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size.html.ini
@@ -2,21 +2,6 @@
[.flexbox 8]
expected: FAIL
- [.flexbox 4]
- expected: FAIL
-
- [.flexbox 5]
- expected: FAIL
-
- [.flexbox 7]
- expected: FAIL
-
- [.flexbox 1]
- expected: FAIL
-
- [.flexbox 2]
- expected: FAIL
-
[.flexbox 3]
expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/position-relative-percentage-top-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-relative-percentage-top-001.html.ini
deleted file mode 100644
index ff13b3f9f52..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/position-relative-percentage-top-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[position-relative-percentage-top-001.html]
- [.border 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/radiobutton-min-size.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/radiobutton-min-size.html.ini
new file mode 100644
index 00000000000..5747cd2deec
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/radiobutton-min-size.html.ini
@@ -0,0 +1,4 @@
+[radiobutton-min-size.html]
+ [two radio button widths are identical]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/relayout-align-items.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/relayout-align-items.html.ini
deleted file mode 100644
index b8914e1fe08..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/relayout-align-items.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[relayout-align-items.html]
- [.flexbox 1]
- expected: FAIL
-
- [.flexbox 2]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/relayout-input.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/relayout-input.html.ini
deleted file mode 100644
index 60b371ec4f3..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/relayout-input.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[relayout-input.html]
- [#target 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-after-sibling-size-change.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-after-sibling-size-change.html.ini
deleted file mode 100644
index e210e664eaf..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-after-sibling-size-change.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[stretch-after-sibling-size-change.html]
- [.flexbox 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/stretched-child-shrink-on-relayout.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/stretched-child-shrink-on-relayout.html.ini
index 80c884cc061..0deee728862 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/stretched-child-shrink-on-relayout.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/stretched-child-shrink-on-relayout.html.ini
@@ -2,18 +2,9 @@
[.flexbox 4]
expected: FAIL
- [.flexbox 5]
- expected: FAIL
-
[.flexbox 6]
expected: FAIL
- [.flexbox 1]
- expected: FAIL
-
[.flexbox 2]
expected: FAIL
- [.flexbox 3]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-with-percent-intrinsic-width.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-with-percent-intrinsic-width.html.ini
deleted file mode 100644
index 3a555b0fc4a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-with-percent-intrinsic-width.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[table-with-percent-intrinsic-width.html]
- [table 2]
- expected: FAIL
-
- [table 1]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
deleted file mode 100644
index 0bf6399b748..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-border-box.html.ini
+++ /dev/null
@@ -1,85 +0,0 @@
-[offsetTopLeft-border-box.html]
- [container: 0]
- expected: FAIL
-
- [container: 1]
- expected: FAIL
-
- [container: 2]
- expected: FAIL
-
- [container: 3]
- expected: FAIL
-
- [container: 4]
- expected: FAIL
-
- [container: 5]
- expected: FAIL
-
- [container: 6]
- expected: FAIL
-
- [container: 7]
- expected: FAIL
-
- [container: 8]
- expected: FAIL
-
- [container: 9]
- expected: FAIL
-
- [container: 10]
- expected: FAIL
-
- [container: 11]
- expected: FAIL
-
- [container: 12]
- expected: FAIL
-
- [container: 13]
- expected: FAIL
-
- [container: 14]
- expected: FAIL
-
- [container: 15]
- expected: FAIL
-
- [container: 16]
- expected: FAIL
-
- [container: 17]
- expected: FAIL
-
- [container: 18]
- expected: FAIL
-
- [container: 19]
- expected: FAIL
-
- [container: 20]
- expected: FAIL
-
- [container: 21]
- expected: FAIL
-
- [container: 22]
- expected: FAIL
-
- [container: 23]
- expected: FAIL
-
- [container: 24]
- expected: FAIL
-
- [container: 25]
- expected: FAIL
-
- [container: 26]
- expected: FAIL
-
- [container: 27]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-trailing-space-inline.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-trailing-space-inline.html.ini
new file mode 100644
index 00000000000..12119501a3f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeft-trailing-space-inline.html.ini
@@ -0,0 +1,7 @@
+[offsetTopLeft-trailing-space-inline.html]
+ [offsetTop/Left of empty inline elements should work as if they were not empty: 1]
+ expected: FAIL
+
+ [offsetTop/Left of empty inline elements should work as if they were not empty: 2]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeftInScrollableParent.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeftInScrollableParent.html.ini
index b8429ccf8ba..0f265fac3d2 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeftInScrollableParent.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/offsetTopLeftInScrollableParent.html.ini
@@ -1,25 +1,4 @@
[offsetTopLeftInScrollableParent.html]
- [Margins on child and parent, border on child]
- expected: FAIL
-
- [Margins on child and parent]
- expected: FAIL
-
- [Basic functionality]
- expected: FAIL
-
- [Margins on child and parent, border on child and parent, padding on child]
- expected: FAIL
-
- [Margins on child]
- expected: FAIL
-
[Margins on child and parent, border on child and parent, padding on child and parent]
expected: FAIL
- [Basic functionality in scrolled parent]
- expected: FAIL
-
- [Margins on child and parent, border on child and parent]
- expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/table-border-collapse-client-width-height.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/table-border-collapse-client-width-height.html.ini
new file mode 100644
index 00000000000..07973305b08
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/table-border-collapse-client-width-height.html.ini
@@ -0,0 +1,4 @@
+[table-border-collapse-client-width-height.html]
+ [Table's clientWidth/Height and OffsetWidth/Height should be the same]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/table-border-separate-client-width-height.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/table-border-separate-client-width-height.html.ini
new file mode 100644
index 00000000000..2856b3313fc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/table-border-separate-client-width-height.html.ini
@@ -0,0 +1,4 @@
+[table-border-separate-client-width-height.html]
+ [Table's clientWidth/Height and OffsetWidth/Height should be the same]
+ expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/table-with-border-client-width-height.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/table-with-border-client-width-height.html.ini
new file mode 100644
index 00000000000..3127bb7a068
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/table-with-border-client-width-height.html.ini
@@ -0,0 +1,4 @@
+[table-with-border-client-width-height.html]
+ [Table's clientWidth/Height and OffsetWidth/Height should be the same]
+ expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/offset_properties_inline.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/offset_properties_inline.html.ini
deleted file mode 100644
index 4712cd619eb..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/offset_properties_inline.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[offset_properties_inline.html]
- [offsetParent]
- expected: FAIL
-