Merge pull request #73 from JetBrains/fix_dispose

Fix crash when we close the window immediately after its start

skiko/src/jvmMain/cpp/linux/drawlayer.cc

@@ -17,7 +17,7 @@ extern "C"
     {
     }
 
-    JNIEXPORT void JNICALL Java_org_jetbrains_skiko_HardwareLayer_dispose(JNIEnv *env, jobject canvas)
+    JNIEXPORT void JNICALL Java_org_jetbrains_skiko_HardwareLayer_nativeDispose(JNIEnv *env, jobject canvas)
     {
     }
 

skiko/src/jvmMain/cpp/windows/drawlayer.cc

@@ -8,7 +8,7 @@ extern "C"
     {
     }
 
-    JNIEXPORT void JNICALL Java_org_jetbrains_skiko_HardwareLayer_dispose(JNIEnv *env, jobject canvas)
+    JNIEXPORT void JNICALL Java_org_jetbrains_skiko_HardwareLayer_nativeDispose(JNIEnv *env, jobject canvas)
     {
     }
 

skiko/src/jvmMain/kotlin/org/jetbrains/skiko/HardwareLayer.kt

@@ -35,11 +35,21 @@ abstract class HardwareLayer : Canvas() {
 
     protected open fun init() {
         useDrawingSurfacePlatformInfo(::nativeInit)
+        onInit()
     }
 
-    protected open external fun nativeInit(platformInfo: Long)
+    fun dispose() {
+        if (isInit) {
+            onDispose()
+            nativeDispose()
+        }
+    }
+
+    protected open fun onInit() = Unit
+    protected open fun onDispose() = Unit
 
-    open external fun dispose()
+    private external fun nativeInit(platformInfo: Long)
+    private external fun nativeDispose()
 
     protected open fun contentScaleChanged() = Unit
 

skiko/src/jvmMain/kotlin/org/jetbrains/skiko/SkiaLayer.kt

@@ -36,8 +36,8 @@ open class SkiaLayer(
     private val pictureRecorder = PictureRecorder()
     private val pictureLock = Any()
 
-    override fun init() {
-        super.init()
+    override fun onInit() {
+        super.onInit()
         val initialRenderApi = fallbackRenderApiQueue.removeAt(0)
         contextHandler = createContextHandler(this, initialRenderApi)
         redrawer = platformOperations.createRedrawer(this, initialRenderApi, properties)
@@ -45,15 +45,15 @@ open class SkiaLayer(
         redraw()
     }
 
-    override fun dispose() {
+    override fun onDispose() {
         check(!isDisposed)
         check(isEventDispatchThread())
+        redrawer?.dispose()  // we should dispose redrawer first (to cancel `draw` in rendering thread)
         contextHandler?.dispose()
-        redrawer?.dispose()
         picture?.instance?.close()
         pictureRecorder.close()
         isDisposed = true
-        super.dispose()
+        super.onDispose()
     }
 
     override fun setBounds(x: Int, y: Int, width: Int, height: Int) {

skiko/src/jvmMain/objectiveC/macos/drawlayer.m

@@ -112,7 +112,7 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_HardwareLayer_nativeInit(JNIEnv
     [layerStorage addObject: layersSet];
 }
 
-JNIEXPORT void JNICALL Java_org_jetbrains_skiko_HardwareLayer_dispose(JNIEnv *env, jobject canvas)
+JNIEXPORT void JNICALL Java_org_jetbrains_skiko_HardwareLayer_nativeDispose(JNIEnv *env, jobject canvas)
 {
     LayerHandler *layer = findByObject(env, canvas);
     if (layer != NULL)