From b73eb49a580cdf3eaf0cc2153524e49165ed0fc5 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Sat, 7 Dec 2019 16:24:09 +0100 Subject: [PATCH] Add sizing of inline replaced boxes --- components/layout_2020/flow/inline.rs | 4 +--- .../css/CSS2/box-display/containing-block-008.xht.ini | 2 ++ .../css/CSS2/box-display/containing-block-009.xht.ini | 2 ++ .../css/CSS2/box-display/containing-block-010.xht.ini | 2 ++ .../css/CSS2/box-display/containing-block-027.xht.ini | 2 ++ .../css/CSS2/box-display/containing-block-028.xht.ini | 2 ++ .../css/CSS2/box-display/display-change-001.xht.ini | 2 -- 7 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-009.xht.ini create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-027.xht.ini create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-028.xht.ini delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-change-001.xht.ini diff --git a/components/layout_2020/flow/inline.rs b/components/layout_2020/flow/inline.rs index 96c933f45968..61c99fc0b7bf 100644 --- a/components/layout_2020/flow/inline.rs +++ b/components/layout_2020/flow/inline.rs @@ -465,9 +465,7 @@ fn layout_atomic<'box_tree>( let fragment = match atomic.as_replaced() { Ok(replaced) => { - // FIXME: implement https://drafts.csswg.org/css2/visudet.html#inline-replaced-width - // and https://drafts.csswg.org/css2/visudet.html#inline-replaced-height - let size = Vec2::zero(); + let size = replaced.used_size(ifc.containing_block, &atomic.style); let fragments = replaced.make_fragments(&atomic.style, size.clone()); let content_rect = Rect { start_corner, size }; BoxFragment { diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini new file mode 100644 index 000000000000..dd630be0f541 --- /dev/null +++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini @@ -0,0 +1,2 @@ +[containing-block-008.xht] + expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-009.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-009.xht.ini new file mode 100644 index 000000000000..4d8ca58286c4 --- /dev/null +++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-009.xht.ini @@ -0,0 +1,2 @@ +[containing-block-009.xht] + expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini new file mode 100644 index 000000000000..af40eef0a5d5 --- /dev/null +++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini @@ -0,0 +1,2 @@ +[containing-block-010.xht] + expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-027.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-027.xht.ini new file mode 100644 index 000000000000..3d51008fd8a9 --- /dev/null +++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-027.xht.ini @@ -0,0 +1,2 @@ +[containing-block-027.xht] + expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-028.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-028.xht.ini new file mode 100644 index 000000000000..51d02b1875c7 --- /dev/null +++ b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-028.xht.ini @@ -0,0 +1,2 @@ +[containing-block-028.xht] + expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-change-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-change-001.xht.ini deleted file mode 100644 index 6b39c7c47cbd..000000000000 --- a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-change-001.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[display-change-001.xht] - expected: FAIL