Revert "fix: text-slot bug in testing framework"

This reverts commit f217333.

Author: TtTRz

float-pigment-css/src/property.rs

@@ -166,9 +166,6 @@ property_list! (PropertyValueWithGlobal, {
     0xa3 TextDecorationThickness: TextDecorationThicknessType as Initial default TextDecorationThickness::Auto;
     0xa4 FontFeatureSettings: FontFeatureSettingsType as Inherit default FontFeatureSettings::Normal;
 
-    // grid
-    0xa5 GridTemplateRows: GridTemplateRowsType as Initial default GridTemplateRows::None;
-
     0xd0 ListStyleType: ListStyleTypeType as Inherit default ListStyleType::Disc;
     0xd1 ListStyleImage: ListStyleImageType as Inherit default ListStyleImage::None;
     0xd2 ListStylePosition: ListStylePositionType as Inherit default ListStylePosition::Outside;
@@ -1660,12 +1657,6 @@ property_value_format! (PropertyValueWithGlobal, {
                 )
         };
     }};
-
-    // grid_template_rows: {{ GridTemplateRows
-    //     = "none" => GridTemplateRows::None
-    //     | <track_list>
-    //     | <auto_track_list>
-    // }};
 });
 
 pub(crate) fn split_hv<T: Clone>(x: Vec<T>) -> (T, T) {

float-pigment-css/src/typing.rs

@@ -134,7 +134,7 @@ pub enum Color {
     Specified(u8, u8, u8, u8),
 }
 
-/// A length value or an expression that evaluates to a length value.
+/// A length value or an expression that evaluates to a langth value.
 #[allow(missing_docs)]
 #[repr(C)]
 #[property_value_type(PropertyValueWithGlobal for LengthType)]
@@ -1796,14 +1796,3 @@ pub enum Gap {
     #[resolve_font_size(Length::resolve_em)]
     Length(Length),
 }
-
-/// The `grid-template-rows` property defines the line names and track sizing functions of the grid rows.
-#[allow(missing_docs)]
-#[repr(C)]
-#[property_value_type(PropertyValueWithGlobal for GridTemplateRowsType)]
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, ResolveFontSize)]
-#[cfg_attr(debug_assertions, derive(CompatibilityEnumCheck))]
-pub enum GridTemplateRows {
-    /// A keyword meaning that there is no explicit grid
-    None,
-}

float-pigment-css/src/typing_stringify.rs

@@ -2336,11 +2336,3 @@ impl fmt::Display for Gap {
         }
     }
 }
-
-impl fmt::Display for GridTemplateRows {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            GridTemplateRows::None => write!(f, "none"),
-        }
-    }
-}

float-pigment-forest/src/node.rs

@@ -315,9 +315,9 @@ impl Node {
     pub(crate) unsafe fn baseline_func(&self) -> Option<&BaselineFn<Len>> {
         (*self.baseline_func.get()).as_deref()
     }
-    pub fn set_baseline_func(&self, baseline_func: Option<Box<BaselineFn<Len>>>) {
+    pub unsafe fn set_baseline_func(&self, baseline_func: Option<Box<BaselineFn<Len>>>) {
         drop(std::mem::replace(
-            unsafe { &mut *self.baseline_func.get() },
+            &mut *self.baseline_func.get(),
             baseline_func,
         ));
     }

float-pigment-forest/tests/custom/css_margin.rs

@@ -365,20 +365,6 @@ fn margin_collapse_between_sibling_and_empty_block_4() {
     )
 }
 
-#[test]
-fn margin_collapse_between_sibling_and_empty_block_5() {
-    assert_xml!(
-        r#"
-            <div style="height: 300px;">
-                <div style="height: 30px; margin-bottom: 50px" expect_height="30" expect_top="0"></div>
-                <text-slot len="0"></text-slot>
-                <div style="height: 30px; margin-top: 100px" expect_height="30" expect_top="130"></div>
-            </div>
-        "#,
-        true
-    )
-}
-
 #[test]
 fn margin_collapse_between_parent_and_empty_block_1() {
     assert_xml!(

float-pigment-forest/tests/mod.rs

@@ -125,12 +125,6 @@ impl TextInfo {
         max_content_height: Len,
     ) -> Size<Len> {
         let text_len = self.text_len;
-        if text_len == 0 {
-            println!(
-                "text_info: {self:?}, width: {min_width:?} ~ {max_width:?}, height: {min_height:?} ~ {max_height:?}, max_content_width: {max_content_width:?}, max_content_height: {max_content_height:?}, measured_width: 0, measured_height: 0",
-            );
-            return Size::new(Len::zero(), Len::zero());
-        }
         let text_width = self.font_size * text_len as f32;
         let max_w = max_width.min(max_content_width);
         let max_h = max_height.min(max_content_height);
@@ -194,11 +188,6 @@ fn convert_font_size_to_px(font_size: float_pigment_css::typing::Length) -> f32
 #[inline(always)]
 fn prepare_measure_node(node: *mut Node, text_info: TextInfo) {
     let node = unsafe { &mut *node };
-    unsafe {
-        node.set_display(Display::Inline);
-        node.set_node_type(float_pigment_forest::NodeType::Text);
-    }
-    node.set_baseline_func(Some(Box::new(|_, _, _| Len::from_f32(16.))));
     node.set_measure_func(Some(Box::new(
         move |_,
               max_width,
@@ -219,6 +208,11 @@ fn prepare_measure_node(node: *mut Node, text_info: TextInfo) {
             )
         },
     )));
+    unsafe {
+        node.set_display(Display::Inline);
+        node.set_baseline_func(Some(Box::new(|_, _, _| Len::from_f32(16.))));
+        node.set_node_type(float_pigment_forest::NodeType::Text);
+    }
 }
 
 impl TestCtx {
@@ -391,6 +385,7 @@ impl TestCtx {
                 self.set_expect_layout_pos(node, e.attributes());
 
                 if is_measure_text_slot(e.tag()) {
+                    let node = Node::new_ptr();
                     let text_len = e
                         .attributes()
                         .get("len")