fix: external memory usage adjustment mismatch (#1123)

Author: Brooooooklyn

.github/workflows/CI.yaml

@@ -288,7 +288,7 @@ jobs:
             target: 'aarch64-apple-darwin'
           - host: windows-latest
             target: 'x86_64-pc-windows-msvc'
-        node: ['20', '22']
+        node: ['20', '22', '24']
     runs-on: ${{ matrix.settings.host }}
 
     steps:
@@ -351,7 +351,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['18', '20', '22']
+        node: ['20', '22', '24']
     runs-on: ubuntu-latest
 
     steps:
@@ -402,7 +402,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['20', '22']
+        node: ['20', '22', '24']
     runs-on: ubuntu-latest
 
     steps:
@@ -455,7 +455,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['20', '22']
+        node: ['20', '22', '24']
     runs-on: ubuntu-24.04-arm
 
     steps:

src/ctx.rs

@@ -1686,6 +1686,7 @@ impl CanvasRenderingContext2D {
   #[napi]
   pub fn draw_image(
     &mut self,
+    env: &Env,
     image: Either3<&mut CanvasElement, &mut SVGCanvas, &mut Image>,
     sx: Option<f64>,
     sy: Option<f64>,
@@ -1703,7 +1704,7 @@ impl CanvasRenderingContext2D {
         if !image.complete {
           return Ok(());
         }
-        image.regenerate_bitmap_if_need()?;
+        image.regenerate_bitmap_if_need(env)?;
         if let Some(bitmap) = &mut image.bitmap {
           BitmapRef::Borrowed(bitmap)
         } else {

src/image.rs

@@ -120,12 +120,14 @@ pub struct Image {
   file_content: Option<Vec<u8>>,
   // take ownership of avif image, let it be dropped when image is dropped
   _avif_image_ref: Option<AvifImage>,
+  // Bytes accounted to V8 via adjust_external_memory for this image
+  accounted_bytes: i64,
 }
 
 impl ObjectFinalize for Image {
   fn finalize(self, env: Env) -> Result<()> {
-    if let Some(bitmap) = self.bitmap {
-      env.adjust_external_memory(-(bitmap.0.width as i64) * (bitmap.0.height as i64) * 4)?;
+    if self.accounted_bytes != 0 {
+      env.adjust_external_memory(-self.accounted_bytes)?;
     }
     Ok(())
   }
@@ -152,6 +154,7 @@ impl Image {
       src: None,
       file_content: None,
       _avif_image_ref: None,
+      accounted_bytes: 0,
     })
   }
 
@@ -266,7 +269,7 @@ impl Image {
     Ok(())
   }
 
-  pub(crate) fn regenerate_bitmap_if_need(&mut self) -> Result<()> {
+  pub(crate) fn regenerate_bitmap_if_need(&mut self, env: &Env) -> Result<()> {
     if !self.need_regenerate_bitmap || !self.is_svg || self.src.is_none() {
       return Ok(());
     }
@@ -281,6 +284,11 @@ impl Image {
         self.color_space,
         &font,
       );
+      if let Some(bmp) = &self.bitmap {
+        let new_bytes = (bmp.0.width as i64) * (bmp.0.height as i64) * 4;
+        self.adjust_external_memory_if_need(env, new_bytes)?;
+      }
+      self.need_regenerate_bitmap = false;
       return Ok(());
     }
     if let Some(data) = self.src.as_ref() {
@@ -293,6 +301,20 @@ impl Image {
         self.color_space,
         &font,
       );
+      if let Some(bmp) = &self.bitmap {
+        let new_bytes = (bmp.0.width as i64) * (bmp.0.height as i64) * 4;
+        self.adjust_external_memory_if_need(env, new_bytes)?;
+      }
+      self.need_regenerate_bitmap = false;
+    }
+    Ok(())
+  }
+
+  fn adjust_external_memory_if_need(&mut self, env: &Env, new_bytes: i64) -> Result<()> {
+    let delta = new_bytes - self.accounted_bytes;
+    if delta != 0 {
+      env.adjust_external_memory(delta)?;
+      self.accounted_bytes = new_bytes;
     }
     Ok(())
   }
@@ -518,7 +540,12 @@ impl Task for BitmapDecoder {
         self_mut.is_svg = bitmap.is_svg;
         self_mut.bitmap = Some(bitmap.data);
         self_mut._avif_image_ref = bitmap.decoded_image;
-        env.adjust_external_memory((output.width as i64) * (output.height as i64) * 4)?;
+        let new_bytes = (output.width as i64) * (output.height as i64) * 4;
+        let delta = new_bytes - self_mut.accounted_bytes;
+        if delta != 0 {
+          env.adjust_external_memory(delta)?;
+          self_mut.accounted_bytes = new_bytes;
+        }
       }
       DecodeStatus::Empty => {}
       DecodeStatus::InvalidSvg => {

src/lib.rs

@@ -144,7 +144,7 @@ impl<'c> CanvasElement<'c> {
       &mut self.ctx.context,
       Context::new(width, height, ColorSpace::default())?,
     );
-    env.adjust_external_memory((width as i64 - old_ctx.width as i64) * 4)?;
+    env.adjust_external_memory((width as i64 - old_ctx.width as i64) * (height as i64) * 4)?;
     Ok(())
   }
 
@@ -162,7 +162,7 @@ impl<'c> CanvasElement<'c> {
       &mut self.ctx.context,
       Context::new(width, height, ColorSpace::default())?,
     );
-    env.adjust_external_memory((height as i64 - old_ctx.height as i64) * 4)?;
+    env.adjust_external_memory((height as i64 - old_ctx.height as i64) * (width as i64) * 4)?;
     Ok(())
   }