Box image data (memory usage optimisation)

Signed-off-by: Nico Burns <[email protected]>
DioxusLabs · Jan 20, 2025 · 90455b9 · 90455b9
1 parent a69bf40
commit 90455b9
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 36 deletions.
diff --git a/packages/blitz-dom/src/document.rs b/packages/blitz-dom/src/document.rs
@@ -586,7 +586,7 @@ impl BaseDocument {
                 match kind {
                     ImageType::Image => {
                         node.element_data_mut().unwrap().node_specific_data =
-                            NodeSpecificData::Image(ImageData::from(image));
+                            NodeSpecificData::Image(Box::new(ImageData::from(image)));
 
                         // Clear layout cache
                         node.cache.clear();
@@ -609,7 +609,7 @@ impl BaseDocument {
                 match kind {
                     ImageType::Image => {
                         node.element_data_mut().unwrap().node_specific_data =
-                            NodeSpecificData::Image(ImageData::Svg(*tree));
+                            NodeSpecificData::Image(Box::new(ImageData::Svg(*tree)));
 
                         // Clear layout cache
                         node.cache.clear();

diff --git a/packages/blitz-dom/src/layout/construct.rs b/packages/blitz-dom/src/layout/construct.rs
@@ -100,7 +100,8 @@ pub(crate) fn collect_layout_children(
                         .unwrap()
                         .element_data_mut()
                         .unwrap()
-                        .node_specific_data = NodeSpecificData::Image(ImageData::Svg(svg));
+                        .node_specific_data =
+                        NodeSpecificData::Image(Box::new(ImageData::Svg(svg)));
                 }
                 Err(err) => {
                     println!("{} SVG parse failed", container_node_id);

diff --git a/packages/blitz-dom/src/layout/mod.rs b/packages/blitz-dom/src/layout/mod.rs
@@ -236,22 +236,22 @@ impl LayoutPartialTree for BaseDocument {
 
                         // Get image's native size
                         let inherent_size = match &element_data.node_specific_data {
-                            NodeSpecificData::Image(ImageData::Raster(data)) => taffy::Size {
-                                width: data.image.width() as f32,
-                                height: data.image.height() as f32,
-                            },
-                            #[cfg(feature = "svg")]
-                            NodeSpecificData::Image(ImageData::Svg(svg)) => {
-                                let size = svg.size();
-                                taffy::Size {
-                                    width: size.width(),
-                                    height: size.height(),
+                            NodeSpecificData::Image(image_data) => match &**image_data {
+                                ImageData::Raster(data) => taffy::Size {
+                                    width: data.image.width() as f32,
+                                    height: data.image.height() as f32,
+                                },
+                                #[cfg(feature = "svg")]
+                                ImageData::Svg(svg) => {
+                                    let size = svg.size();
+                                    taffy::Size {
+                                        width: size.width(),
+                                        height: size.height(),
+                                    }
                                 }
-                            }
-                            NodeSpecificData::None => taffy::Size {
-                                width: 0.0,
-                                height: 0.0,
+                                ImageData::None => taffy::Size::ZERO,
                             },
+                            NodeSpecificData::None => taffy::Size::ZERO,
                             _ => unreachable!(),
                         };
 

diff --git a/packages/blitz-dom/src/node.rs b/packages/blitz-dom/src/node.rs
@@ -412,32 +412,46 @@ impl ElementNodeData {
         attr.value.parse::<T>().ok()
     }
 
-    pub fn raster_image_data(&self) -> Option<&RasterImageData> {
+    pub fn image_data(&self) -> Option<&ImageData> {
         match self.node_specific_data {
-            NodeSpecificData::Image(ImageData::Raster(ref data)) => Some(data),
+            NodeSpecificData::Image(ref data) => Some(&**data),
             _ => None,
         }
     }
 
-    pub fn raster_image_data_mut(&mut self) -> Option<&mut RasterImageData> {
+    pub fn image_data_mut(&mut self) -> Option<&mut ImageData> {
         match self.node_specific_data {
-            NodeSpecificData::Image(ImageData::Raster(ref mut data)) => Some(data),
+            NodeSpecificData::Image(ref mut data) => Some(&mut **data),
+            _ => None,
+        }
+    }
+
+    pub fn raster_image_data(&self) -> Option<&RasterImageData> {
+        match self.image_data()? {
+            ImageData::Raster(ref data) => Some(data),
+            _ => None,
+        }
+    }
+
+    pub fn raster_image_data_mut(&mut self) -> Option<&mut RasterImageData> {
+        match self.image_data_mut()? {
+            ImageData::Raster(ref mut data) => Some(data),
             _ => None,
         }
     }
 
     #[cfg(feature = "svg")]
     pub fn svg_data(&self) -> Option<&usvg::Tree> {
-        match self.node_specific_data {
-            NodeSpecificData::Image(ImageData::Svg(ref data)) => Some(data),
+        match self.image_data()? {
+            ImageData::Svg(ref data) => Some(data),
             _ => None,
         }
     }
 
     #[cfg(feature = "svg")]
     pub fn svg_data_mut(&mut self) -> Option<&mut usvg::Tree> {
-        match self.node_specific_data {
-            NodeSpecificData::Image(ImageData::Svg(ref mut data)) => Some(data),
+        match self.image_data_mut()? {
+            ImageData::Svg(ref mut data) => Some(data),
             _ => None,
         }
     }
@@ -626,7 +640,7 @@ impl TextInputData {
 #[derive(Clone)]
 pub enum NodeSpecificData {
     /// The element's image content (\<img\> element's only)
-    Image(ImageData),
+    Image(Box<ImageData>),
     /// Pre-computed table layout data
     TableRoot(Arc<TableContext>),
     /// Parley text editor (text inputs)
@@ -640,7 +654,7 @@ pub enum NodeSpecificData {
 impl std::fmt::Debug for NodeSpecificData {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            NodeSpecificData::Image(data) => match data {
+            NodeSpecificData::Image(data) => match **data {
                 ImageData::Raster(_) => f.write_str("NodeSpecificData::Image(Raster)"),
                 #[cfg(feature = "svg")]
                 ImageData::Svg(_) => f.write_str("NodeSpecificData::Image(Svg)"),

diff --git a/packages/blitz-dom/src/stylo.rs b/packages/blitz-dom/src/stylo.rs
@@ -549,8 +549,7 @@ impl selectors::Element for BlitzNode<'_> {
     }
 
     fn is_link(&self) -> bool {
-        self.data
-            .is_element_with_tag_name(&local_name!("a"))
+        self.data.is_element_with_tag_name(&local_name!("a"))
     }
 
     fn is_html_slot_element(&self) -> bool {
@@ -834,9 +833,7 @@ impl<'a> TElement for BlitzNode<'a> {
 
     fn is_html_document_body_element(&self) -> bool {
         // Check node is a <body> element
-        let is_body_element = self
-            .data
-            .is_element_with_tag_name(&local_name!("body"));
+        let is_body_element = self.data.is_element_with_tag_name(&local_name!("body"));
 
         // If it isn't then return early
         if !is_body_element {

diff --git a/packages/blitz-renderer-vello/src/renderer/render.rs b/packages/blitz-renderer-vello/src/renderer/render.rs
@@ -148,10 +148,10 @@ impl VelloSceneGenerator<'_> {
                     .children
                     .iter()
                     .find_map(|id| {
-                        self.dom.as_ref().get_node(*id).filter(|node| {
-                            node.data
-                                .is_element_with_tag_name(&local_name!("body"))
-                        })
+                        self.dom
+                            .as_ref()
+                            .get_node(*id)
+                            .filter(|node| node.data.is_element_with_tag_name(&local_name!("body")))
                     })
                     .and_then(|body| body.primary_styles())
                     .map(|style| {