From 14ddf39215a0ff4bed7d3a5d3de258fa12461159 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Sat, 7 Dec 2019 23:39:48 +0100 Subject: [PATCH] Rename ReplacedContent::used_size to used_size_as_if_inline_element --- components/layout_2020/flow/inline.rs | 2 +- components/layout_2020/flow/mod.rs | 2 +- components/layout_2020/replaced.rs | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/components/layout_2020/flow/inline.rs b/components/layout_2020/flow/inline.rs index 61c99fc0b7b..c4b760275d9 100644 --- a/components/layout_2020/flow/inline.rs +++ b/components/layout_2020/flow/inline.rs @@ -465,7 +465,7 @@ fn layout_atomic<'box_tree>( let fragment = match atomic.as_replaced() { Ok(replaced) => { - let size = replaced.used_size(ifc.containing_block, &atomic.style); + let size = replaced.used_size_as_if_inline_element(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/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs index 0e0c08cc168..ed578c825ef 100644 --- a/components/layout_2020/flow/mod.rs +++ b/components/layout_2020/flow/mod.rs @@ -521,7 +521,7 @@ fn layout_in_flow_replaced_block_level<'a>( style: &Arc, replaced: &ReplacedContent, ) -> BoxFragment { - let size = replaced.used_size(containing_block, style); + let size = replaced.used_size_as_if_inline_element(containing_block, style); let cbis = containing_block.inline_size; let padding = style.padding().percentages_relative_to(cbis); diff --git a/components/layout_2020/replaced.rs b/components/layout_2020/replaced.rs index 16a9b86fa8e..72071dbf684 100644 --- a/components/layout_2020/replaced.rs +++ b/components/layout_2020/replaced.rs @@ -123,9 +123,12 @@ impl ReplacedContent { } } - // https://drafts.csswg.org/css2/visudet.html#inline-replaced-width - // https://drafts.csswg.org/css2/visudet.html#inline-replaced-height - pub fn used_size( + /// https://drafts.csswg.org/css2/visudet.html#inline-replaced-width + /// https://drafts.csswg.org/css2/visudet.html#inline-replaced-height + /// + /// Also used in other cases, for example + /// https://drafts.csswg.org/css2/visudet.html#block-replaced-width + pub fn used_size_as_if_inline_element( &self, containing_block: &ContainingBlock, style: &ComputedValues,