min/max-width/height, replaced elements

components/layout_2020/dom_traversal.rs

@@ -17,7 +17,6 @@ use std::sync::Arc;
 use style::dom::TNode;
 use style::properties::ComputedValues;
 use style::selector_parser::PseudoElement;
-use style::values::computed::Length;
 
 #[derive(Clone, Copy)]
 pub enum WhichPseudoElement {
@@ -299,7 +298,10 @@ impl Drop for BoxSlot<'_> {
 pub(crate) trait NodeExt<'dom>: 'dom + Copy + LayoutNode + Send + Sync {
     fn is_element(self) -> bool;
     fn as_text(self) -> Option<String>;
-    fn as_image(self) -> Option<(Option<Arc<NetImage>>, Vec2<Length>)>;
+
+    /// Returns the image if it’s loaded, and its size in image pixels
+    /// adjusted for `image_density`.
+    fn as_image(self) -> Option<(Option<Arc<NetImage>>, Vec2<f64>)>;
     fn first_child(self) -> Option<Self>;
     fn next_sibling(self) -> Option<Self>;
     fn parent_node(self) -> Option<Self>;
@@ -328,22 +330,22 @@ where
         }
     }
 
-    fn as_image(self) -> Option<(Option<Arc<NetImage>>, Vec2<Length>)> {
+    fn as_image(self) -> Option<(Option<Arc<NetImage>>, Vec2<f64>)> {
         let node = self.to_threadsafe();
         let (resource, metadata) = node.image_data()?;
         let (width, height) = resource
             .as_ref()
             .map(|image| (image.width, image.height))
             .or_else(|| metadata.map(|metadata| (metadata.width, metadata.height)))
             .unwrap_or((0, 0));
-        let (mut width, mut height) = (width as f32, height as f32);
+        let (mut width, mut height) = (width as f64, height as f64);
         if let Some(density) = node.image_density().filter(|density| *density != 1.) {
-            width = (width as f64 / density) as f32;
-            height = (height as f64 / density) as f32;
+            width = width / density;
+            height = height / density;
         }
         let size = Vec2 {
-            x: Length::new(width),
-            y: Length::new(height),
+            x: width,
+            y: height,
         };
         Some((resource, size))
     }

components/layout_2020/flow/construct.rs

@@ -393,7 +393,7 @@ where
                     style.clone(),
                     display_inside,
                     contents,
-                    ContentSizesRequest::inline_if(style.inline_size_is_auto()),
+                    ContentSizesRequest::inline_if(!style.inline_size_is_length()),
                 ),
             ))
         };
@@ -590,7 +590,7 @@ where
                     &style,
                     ContentSizesRequest::inline_if(
                         max_assign_in_flow_outer_content_sizes_to.is_some() &&
-                            style.inline_size_is_auto(),
+                            !style.inline_size_is_length(),
                     ),
                 );
                 if let Some(to) = max_assign_in_flow_outer_content_sizes_to {
@@ -607,7 +607,7 @@ where
             } => {
                 let content_sizes = ContentSizesRequest::inline_if(
                     max_assign_in_flow_outer_content_sizes_to.is_some() &&
-                        style.inline_size_is_auto(),
+                        !style.inline_size_is_length(),
                 );
                 let contents = IndependentFormattingContext::construct(
                     context,

components/layout_2020/flow/float.rs

@@ -33,7 +33,7 @@ impl FloatBox {
         display_inside: DisplayInside,
         contents: Contents<impl NodeExt<'dom>>,
     ) -> Self {
-        let content_sizes = ContentSizesRequest::inline_if(style.inline_size_is_auto());
+        let content_sizes = ContentSizesRequest::inline_if(!style.inline_size_is_length());
         Self {
             contents: IndependentFormattingContext::construct(
                 context,

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_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 {
@@ -482,10 +480,29 @@ fn layout_atomic<'box_tree>(
         },
         Err(non_replaced) => {
             let box_size = atomic.style.box_size();
-            let inline_size = box_size.inline.percentage_relative_to(cbis).auto_is(|| {
-                let available_size = cbis - pbm.inline_sum();
-                atomic.content_sizes.shrink_to_fit(available_size)
-            });
+            let max_box_size = atomic
+                .style
+                .max_box_size()
+                .percentages_relative_to(ifc.containing_block);
+            let min_box_size = atomic
+                .style
+                .min_box_size()
+                .percentages_relative_to(ifc.containing_block)
+                .auto_is(Length::zero);
+
+            // https://drafts.csswg.org/css2/visudet.html#inlineblock-width
+            let tentative_inline_size =
+                box_size.inline.percentage_relative_to(cbis).auto_is(|| {
+                    let available_size = cbis - pbm.inline_sum();
+                    atomic.content_sizes.shrink_to_fit(available_size)
+                });
+
+            // https://drafts.csswg.org/css2/visudet.html#min-max-widths
+            // In this case “applying the rules above again” with a non-auto inline-size
+            // always results in that size.
+            let inline_size = tentative_inline_size
+                .clamp_between_extremums(min_box_size.inline, max_box_size.inline);
+
             let block_size = box_size
                 .block
                 .maybe_percentage_relative_to(ifc.containing_block.block_size.non_auto());
@@ -508,7 +525,16 @@ fn layout_atomic<'box_tree>(
                 dummy_tree_rank,
                 ifc.absolutely_positioned_fragments,
             );
-            let block_size = block_size.auto_is(|| independent_layout.content_block_size);
+
+            // https://drafts.csswg.org/css2/visudet.html#block-root-margin
+            let tentative_block_size = block_size.auto_is(|| independent_layout.content_block_size);
+
+            // https://drafts.csswg.org/css2/visudet.html#min-max-heights
+            // In this case “applying the rules above again” with a non-auto block-size
+            // always results in that size.
+            let block_size = tentative_block_size
+                .clamp_between_extremums(min_box_size.block, max_box_size.block);
+
             let content_rect = Rect {
                 start_corner,
                 size: Vec2 {