fix(canvas): v8 objects leak, view scaling

Author: triniwiz

crates/canvas-android/src/jni_compat/org_nativescript_canvas_NSCCanvas.rs

@@ -482,6 +482,22 @@ pub extern "system" fn nativeReleaseWebGLNormal(_env: JNIEnv, _: JClass, context
     let _ = unsafe { Box::from_raw(context) };
 }
 
+#[no_mangle]
+pub extern "system" fn nativeRelease2DContext(context: jlong) {
+    if context == 0 {
+        return;
+    }
+    canvas_c::canvas_native_context_release(context as *mut canvas_c::CanvasRenderingContext2D);
+}
+
+#[no_mangle]
+pub extern "system" fn nativeRelease2DContextNormal(_env: JNIEnv, _: JClass, context: jlong) {
+    if context == 0 {
+        return;
+    }
+    canvas_c::canvas_native_context_release(context as *mut canvas_c::CanvasRenderingContext2D);
+}
+
 #[no_mangle]
 pub extern "system" fn nativeMakeWebGLCurrent(gl_context: jlong) -> jboolean {
     if gl_context == 0 {

crates/canvas-android/src/lib.rs

@@ -18,7 +18,7 @@ use log::LevelFilter;
 // #[cfg(feature = "vulkan")]
 use crate::jni_compat::org_nativescript_canvas_NSCCanvas::{nativeCreate2dContextVulkan, nativeGetVulkanVersion, nativeContext2DSetRenderFunc, nativeContext2DClearRenderFunc};
 
-use crate::jni_compat::org_nativescript_canvas_NSCCanvas::{nativeContext2DPathTest, nativeContext2DPathTestNormal, nativeContext2DRender, nativeContext2DTest, nativeContext2DTestNormal, nativeCreate2DContext, nativeCustomWithBitmapFlush, nativeInitWebGL, nativeInitWebGLNoSurface, nativeInitWebGPU, nativeMakeWebGLCurrent, nativeMakeWebGLCurrentNormal, nativeReleaseWebGL, nativeReleaseWebGLNormal, nativeResizeWebGPU, nativeUpdate2DSurface, nativeUpdate2DSurfaceNoSurface, nativeUpdate2DSurfaceNoSurfaceNormal, nativeUpdateGLNoSurface, nativeUpdateWebGLNoSurfaceNormal, nativeUpdateWebGLSurface, nativeWebGLC2DRender, nativeWriteCurrentWebGLContextToBitmap, nativeContext2DConicTest};
+use crate::jni_compat::org_nativescript_canvas_NSCCanvas::{nativeContext2DPathTest, nativeContext2DPathTestNormal, nativeContext2DRender, nativeContext2DTest, nativeContext2DTestNormal, nativeCreate2DContext, nativeCustomWithBitmapFlush, nativeInitWebGL, nativeInitWebGLNoSurface, nativeInitWebGPU, nativeMakeWebGLCurrent, nativeMakeWebGLCurrentNormal, nativeRelease2DContext, nativeRelease2DContextNormal, nativeReleaseWebGL, nativeReleaseWebGLNormal, nativeResizeWebGPU, nativeUpdate2DSurface, nativeUpdate2DSurfaceNoSurface, nativeUpdate2DSurfaceNoSurfaceNormal, nativeUpdateGLNoSurface, nativeUpdateWebGLNoSurfaceNormal, nativeUpdateWebGLSurface, nativeWebGLC2DRender, nativeWriteCurrentWebGLContextToBitmap, nativeContext2DConicTest};
 use crate::jni_compat::org_nativescript_canvas_NSCCanvasRenderingContext2D::{nativeCreatePattern, nativeDrawAtlasWithBitmap, nativeDrawImageDxDyDwDhWithAsset, nativeDrawImageDxDyDwDhWithBitmap, nativeDrawImageDxDyWithAsset, nativeDrawImageDxDyWithBitmap, nativeDrawImageWithAsset, nativeDrawImageWithBitmap, nativeScale};
 use crate::jni_compat::org_nativescript_canvas_NSCImageAsset::{nativeCreateImageAsset, nativeDestroyImageAsset, nativeGetDimensions, nativeGetError, nativeLoadFromBitmap, nativeLoadFromBuffer, nativeLoadFromBytes, nativeLoadFromEncodedBuffer, nativeLoadFromEncodedBytes, nativeLoadFromPath, nativeLoadFromUrl};
 use crate::jni_compat::org_nativescript_canvas_NSCImageBitmap::{nativeLoadBitmapFromBuffer, nativeLoadBitmapFromBufferOptions, nativeLoadBitmapFromBufferRectOptions, nativeLoadBitmapFromBytes, nativeLoadBitmapFromBytesOptions, nativeLoadBitmapFromBytesRectOptions};
@@ -83,6 +83,7 @@ pub extern "system" fn JNI_OnLoad(vm: JavaVM, _reserved: *const c_void) -> jint
                 "nativeUpdate2DSurfaceNoSurface",
                 "nativeUpdateWebGLNoSurface",
                 "nativeReleaseWebGL",
+                "nativeRelease2DContext",
                 "nativeMakeWebGLCurrent",
                 "nativeWriteCurrentWebGLContextToBitmap",
                 "nativeInitContextWithCustomSurface",
@@ -114,6 +115,7 @@ pub extern "system" fn JNI_OnLoad(vm: JavaVM, _reserved: *const c_void) -> jint
                     "(IIJ)V",
                     "(IIJ)V",
                     "(J)V",
+                    "(J)V",
                     "(J)Z",
                     "(JLandroid/graphics/Bitmap;)V",
                     "(IIFZIFII)J",
@@ -147,6 +149,7 @@ pub extern "system" fn JNI_OnLoad(vm: JavaVM, _reserved: *const c_void) -> jint
                     "!(IIJ)V",
                     "!(IIJ)V",
                     "!(J)V",
+                    "!(J)V",
                     "!(J)Z",
                     "!(JLandroid/graphics/Bitmap;)V",
                     "!(IIFZIFII)J",
@@ -183,6 +186,7 @@ pub extern "system" fn JNI_OnLoad(vm: JavaVM, _reserved: *const c_void) -> jint
                     nativeUpdate2DSurfaceNoSurface as *mut c_void,
                     nativeUpdateGLNoSurface as *mut c_void,
                     nativeReleaseWebGL as *mut c_void,
+                    nativeRelease2DContext as *mut c_void,
                     nativeMakeWebGLCurrent as *mut c_void,
                     nativeWriteCurrentWebGLContextToBitmap as *mut c_void,
                     nativeInitContextWithCustomSurface as *mut c_void,
@@ -206,6 +210,7 @@ pub extern "system" fn JNI_OnLoad(vm: JavaVM, _reserved: *const c_void) -> jint
                     nativeUpdate2DSurfaceNoSurfaceNormal as *mut c_void,
                     nativeUpdateWebGLNoSurfaceNormal as *mut c_void,
                     nativeReleaseWebGLNormal as *mut c_void,
+                    nativeRelease2DContextNormal as *mut c_void,
                     nativeMakeWebGLCurrentNormal as *mut c_void,
                     nativeWriteCurrentWebGLContextToBitmap as *mut c_void,
                     nativeInitContextWithCustomSurfaceNormal as *mut c_void,

crates/canvas-c/src/c2d/context.rs

@@ -311,7 +311,9 @@ pub extern "C" fn canvas_native_raf_release(value: *mut crate::Raf) {
     if value.is_null() {
         return;
     }
-    canvas_native_raf_stop_and_clear(value, 100);
+    let raf = unsafe { &*value };
+    raf.0.stop();
+    raf.0.clear_callback();
     unsafe {
         drop(Box::from_raw(value));
     }

crates/canvas-ios/src/lib.rs

@@ -200,6 +200,15 @@ pub extern "C" fn canvas_native_ios_release_webgl(context: i64) {
     let _ = unsafe { Box::from_raw(context) };
 }
 
+#[no_mangle]
+pub extern "C" fn canvas_native_ios_release_2d_context(context: i64) {
+    if context == 0 {
+        return;
+    }
+    let context = context as *mut CanvasRenderingContext2D;
+    let _ = unsafe { Box::from_raw(context) };
+}
+
 #[no_mangle]
 pub extern "C" fn canvas_native_ios_gl_make_current(context: i64) {
     if context == 0 {

packages/canvas-babylon/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-babylon",
-	"version": "2.0.29",
+	"version": "2.0.30",
 	"description": "",
 	"main": "index",
 	"typings": "index.d.ts",

packages/canvas-chartjs/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-chartjs",
-	"version": "2.0.17",
+	"version": "2.0.18",
 	"description": "ChartJS",
 	"main": "index",
 	"typings": "index.d.ts",

packages/canvas-media/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-media",
-	"version": "2.0.29",
+	"version": "2.0.30",
 	"description": "Canvas media",
 	"main": "index",
 	"typings": "index.d.ts",

packages/canvas-phaser-ce/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-phaser-ce",
-	"version": "2.0.29",
+	"version": "2.0.30",
 	"description": "Tools for using Phaser-ce to build native 2D games in NativeScript 👾",
 	"main": "index",
 	"typings": "index.d.ts",

packages/canvas-phaser/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-phaser",
-	"version": "2.0.29",
+	"version": "2.0.30",
 	"description": "Build awesome 2D games with Phaser.js and NativeScript",
 	"main": "index",
 	"typings": "index.d.ts",

packages/canvas-pixi/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/canvas-pixi",
-	"version": "2.0.29",
+	"version": "2.0.30",
 	"description": "Plugin for using pixi.js in NativeScript",
 	"main": "index",
 	"typings": "index.d.ts",