Revive Skia Native Sample (#174)

* A better TODO for native bindings

* Revided native skia demo with the new bindings

* Enable some RRect opearions in native bindings

samples/SkiaNativeSample/src/macosX64Main/kotlin/org.jetbrains.skiko.sample.native/App.kt

@@ -40,8 +40,7 @@ class Renderer(
     override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) {
         this.canvas = canvas
         val contentScale = layer.contentScale
-        // TODO: Disabled for now, as it requires us to pass float array to native world.
-        //canvas.scale(contentScale, contentScale)
+        canvas.scale(contentScale, contentScale)
         displayScene(this, (width / contentScale).toInt(), (height / contentScale).toInt(), nanoTime)
         layer.needRedraw()
     }
@@ -51,16 +50,17 @@ fun displayScene(renderer: Renderer, nanoTime: Long) {
     val canvas = renderer.canvas!!
 
     val paint = Paint()
+    // TODO: make color constants.
     //paint.setColor(Color.GREEN)
     paint.setColor(0xFF00FF00.toInt())
 
-    // canvas.clear(Color.RED);
-    canvas.clear(0x00FF00FF.toInt());
+    // TODO: make color constants.
+    // canvas.clear(Color.RED)
+    canvas.clear(0xFFFF0000.toInt())
 
     canvas.save();
-    // TODO: disabled to ramp up the new native skiko.
-    //canvas.translate(128.0f, 128.0f)
-    //canvas.rotate(nanoTime.toFloat() / 1e7f)
+    canvas.translate(128.0f, 128.0f)
+    canvas.rotate(nanoTime.toFloat() / 1e7f)
     val rect = Rect.makeXYWH(-90.5f, -90.5f, 181.0f, 181.0f)
     canvas.drawRect(rect, paint)
     canvas.restore();

skiko/build.gradle.kts

@@ -397,13 +397,13 @@ project.tasks.register<Exec>("nativeBridgesCompile") {
         "clang++",
         *targetArch.clangFlags,
         *targetOs.clangFlags,
-        "-std=c++17",
+        *buildType.clangFlags,
         "-c",
         "-DPROVIDE_JNI_TYPES",
         "-DSK_SHAPER_CORETEXT_AVAILABLE",
         "-DSK_BUILD_FOR_MAC",
         "-DSK_METAL",
-        "-I$projectDir/src/macosX64Main/cpp/headers",
+        "-I$projectDir/src/macosX64Main/cpp/include",
         "-I$projectDir/src/commonMain/cpp/headers",
         *skiaPreprocessorFlags,
         *srcs

skiko/src/commonMain/cpp/common/common_interop.cc

 #include "common.h"
 #include "src/utils/SkUTF.h"
+#include <stdio.h>
 
 jlong packTwoInts(int32_t a, int32_t b) {
     return (uint64_t (a) << 32) | b;
@@ -72,3 +73,10 @@ uint32_t skija::UtfIndicesConverter::from8To16(size_t i8) {
 
     return fPos16;
 }
+
+void TODO(const char* message) {
+    printf("TODO: %s\n", message);
+    fflush(stdout);
+    abort();
+}
+

skiko/src/commonMain/cpp/headers/common.h

@@ -55,5 +55,12 @@ jlong ptrToJlong(T* ptr) {
     return static_cast<jlong>(reinterpret_cast<uintptr_t>(ptr));
 }
 
+#ifdef __clang__
+__attribute__((noreturn))
+void TODO(const char*);
+#else
+void TODO(const char*);
+#endif
+
 #endif /* SKIKO_COMMON_H */
 

skiko/src/commonMain/kotlin/org/jetbrains/skia/BackendRenderTarget.kt

@@ -18,7 +18,16 @@ class BackendRenderTarget internal constructor(ptr: NativePointer) : Managed(ptr
             fbFormat: Int
         ): BackendRenderTarget {
             Stats.onNativeCall()
-            return BackendRenderTarget(_nMakeGL(width, height, sampleCnt, stencilBits, fbId, fbFormat))
+            return BackendRenderTarget(
+                _nMakeGL(
+                    width,
+                    height,
+                    sampleCnt,
+                    stencilBits,
+                    fbId,
+                    fbFormat
+                )
+            )
         }
 
         fun makeMetal(width: Int, height: Int, texturePtr: NativePointer): BackendRenderTarget {

skiko/src/commonMain/kotlin/org/jetbrains/skia/Canvas.kt

@@ -3,13 +3,8 @@ package org.jetbrains.skia
 
 import org.jetbrains.skia.ImageFilter.Companion.makeDropShadowOnly
 import org.jetbrains.skia.impl.Library.Companion.staticLoad
-import org.jetbrains.skia.impl.Managed
-import org.jetbrains.skia.impl.Stats
-import org.jetbrains.skia.impl.reachabilityBarrier
-import org.jetbrains.skia.impl.use
 import org.jetbrains.skia.ExternalSymbolName
-import org.jetbrains.skia.impl.NativePointer
-import org.jetbrains.skia.impl.getPtr
+import org.jetbrains.skia.impl.*
 import kotlin.jvm.JvmStatic
 
 open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, internal val _owner: Any) :
@@ -58,7 +53,8 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
             top: Float,
             right: Float,
             bottom: Float,
-            radii: FloatArray?,
+            radii: InteropPointer,
+            radiiSize: Int,
             paintPtr: NativePointer
         )
 
@@ -70,12 +66,14 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
             ot: Float,
             or: Float,
             ob: Float,
-            oradii: FloatArray?,
+            oradii: InteropPointer,
+            oradiiSize: Int,
             il: Float,
             it: Float,
             ir: Float,
             ib: Float,
-            iradii: FloatArray?,
+            iradii: InteropPointer,
+            iradiiSize: Int,
             paintPtr: NativePointer
         )
 
@@ -128,7 +126,8 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
         external fun _nDrawTextBlob(ptr: NativePointer, blob: NativePointer, x: Float, y: Float, paint: NativePointer)
         @JvmStatic
         @ExternalSymbolName("org_jetbrains_skia_Canvas__1nDrawPicture")
-        external fun _nDrawPicture(ptr: NativePointer, picturePtr: NativePointer, matrix: FloatArray?, paintPtr: NativePointer)
+        external fun _nDrawPicture(ptr: NativePointer, picturePtr: NativePointer, matrix: InteropPointer, paintPtr: NativePointer)
+
         @JvmStatic
         @ExternalSymbolName("org_jetbrains_skia_Canvas__1nDrawVertices")
         external fun _nDrawVertices(
@@ -191,7 +190,8 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
             top: Float,
             right: Float,
             bottom: Float,
-            radii: FloatArray?,
+            radii: InteropPointer,
+            size: Int,
             mode: Int,
             antiAlias: Boolean
         )
@@ -204,10 +204,12 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
         external fun _nClipRegion(ptr: NativePointer, nativeRegion: NativePointer, mode: Int)
         @JvmStatic
         @ExternalSymbolName("org_jetbrains_skia_Canvas__1nConcat")
-        external fun _nConcat(ptr: NativePointer, matrix: FloatArray?)
+        external fun _nConcat(ptr: NativePointer, matrix: InteropPointer)
+
         @JvmStatic
         @ExternalSymbolName("org_jetbrains_skia_Canvas__1nConcat44")
-        external fun _nConcat44(ptr: NativePointer, matrix: FloatArray?)
+        external fun _nConcat44(ptr: NativePointer, matrix: InteropPointer)
+
         @JvmStatic
         @ExternalSymbolName("org_jetbrains_skia_Canvas__1nReadPixels")
         external fun _nReadPixels(ptr: NativePointer, bitmapPtr: NativePointer, srcX: Int, srcY: Int): Boolean
@@ -515,27 +517,33 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
 
     fun drawRRect(r: RRect, paint: Paint): Canvas {
         Stats.onNativeCall()
-        _nDrawRRect(_ptr, r.left, r.top, r.right, r.bottom, r.radii, getPtr(paint))
+        interopScope {
+            _nDrawRRect(_ptr, r.left, r.top, r.right, r.bottom, toInterop(r.radii), r.radii.size, getPtr(paint))
+        }
         reachabilityBarrier(paint)
         return this
     }
 
     fun drawDRRect(outer: RRect, inner: RRect, paint: Paint): Canvas {
         Stats.onNativeCall()
-        _nDrawDRRect(
-            _ptr,
-            outer.left,
-            outer.top,
-            outer.right,
-            outer.bottom,
-            outer.radii,
-            inner.left,
-            inner.top,
-            inner.right,
-            inner.bottom,
-            inner.radii,
-            getPtr(paint)
-        )
+        interopScope {
+            _nDrawDRRect(
+                _ptr,
+                outer.left,
+                outer.top,
+                outer.right,
+                outer.bottom,
+                toInterop(outer.radii),
+                outer.radii.size,
+                inner.left,
+                inner.top,
+                inner.right,
+                inner.bottom,
+                toInterop(inner.radii),
+                inner.radii.size,
+                getPtr(paint)
+            )
+        }
         reachabilityBarrier(paint)
         return this
     }
@@ -715,9 +723,11 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
 
     fun drawPicture(picture: Picture, matrix: Matrix33?, paint: Paint?): Canvas {
         Stats.onNativeCall()
-        _nDrawPicture(_ptr, getPtr(picture), matrix?.mat, getPtr(paint))
-        reachabilityBarrier(picture)
-        reachabilityBarrier(paint)
+        interopScope {
+            _nDrawPicture(_ptr, getPtr(picture), toInterop(matrix?.mat), getPtr(paint))
+            reachabilityBarrier(picture)
+            reachabilityBarrier(paint)
+        }
         return this
     }
 
@@ -1293,7 +1303,9 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
 
     fun clipRRect(r: RRect, mode: ClipMode, antiAlias: Boolean): Canvas {
         Stats.onNativeCall()
-        _nClipRRect(_ptr, r.left, r.top, r.right, r.bottom, r.radii, mode.ordinal, antiAlias)
+        interopScope {
+            _nClipRRect(_ptr, r.left, r.top, r.right, r.bottom, toInterop(r.radii), r.radii.size, mode.ordinal, antiAlias)
+        }
         return this
     }
 
@@ -1360,14 +1372,22 @@ open class Canvas internal constructor(ptr: NativePointer, managed: Boolean, int
     }
 
     fun concat(matrix: Matrix33): Canvas {
-        Stats.onNativeCall()
-        _nConcat(_ptr, matrix.mat)
+        interopScope {
+            Stats.onNativeCall()
+            _nConcat(
+                _ptr, toInterop(matrix.mat)
+            )
+        }
         return this
     }
 
     fun concat(matrix: Matrix44): Canvas {
-        Stats.onNativeCall()
-        _nConcat44(_ptr, matrix.mat)
+        interopScope {
+            Stats.onNativeCall()
+            _nConcat44(
+                _ptr, toInterop(matrix.mat)
+            )
+        }
         return this
     }
 

skiko/src/commonMain/kotlin/org/jetbrains/skia/Path.kt

 @file:Suppress("NESTED_EXTERNAL_DECLARATION")
 package org.jetbrains.skia
 
+import org.jetbrains.skia.impl.*
 import org.jetbrains.skia.impl.Library.Companion.staticLoad
-import org.jetbrains.skia.impl.Managed
-import org.jetbrains.skia.impl.Native
-import org.jetbrains.skia.impl.Stats
-import org.jetbrains.skia.impl.reachabilityBarrier
-import org.jetbrains.skia.impl.NativePointer
-import org.jetbrains.skia.impl.getPtr
 import kotlin.jvm.JvmStatic
 
 /**
@@ -435,7 +430,8 @@ class Path internal constructor(ptr: NativePointer) : Managed(ptr, _FinalizerHol
             t: Float,
             r: Float,
             b: Float,
-            radii: FloatArray?,
+            radii: InteropPointer,
+            size: Int,
             dir: Int,
             start: Int
         )
@@ -1917,7 +1913,9 @@ class Path internal constructor(ptr: NativePointer) : Managed(ptr, _FinalizerHol
      */
     fun addRRect(rrect: RRect, dir: PathDirection = PathDirection.CLOCKWISE, start: Int = 6): Path {
         Stats.onNativeCall()
-        _nAddRRect(_ptr, rrect.left, rrect.top, rrect.right, rrect.bottom, rrect.radii, dir.ordinal, start)
+        interopScope {
+            _nAddRRect(_ptr, rrect.left, rrect.top, rrect.right, rrect.bottom, toInterop(rrect.radii), rrect.radii.size, dir.ordinal, start)
+        }
         return this
     }
 

skiko/src/jvmMain/cpp/common/Canvas.cc

@@ -70,7 +70,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawOval
 }
 
 extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawRRect
-  (JNIEnv* env, jclass jclass, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloatArray jradii, jlong paintPtr) {
+  (JNIEnv* env, jclass jclass, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloatArray jradii, jint jradiiSize, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
     canvas->drawRRect(skija::RRect::toSkRRect(env, left, top, right, bottom, jradii), *paint);
@@ -78,8 +78,8 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawRRect
 
 extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nDrawDRRect
   (JNIEnv* env, jclass jclass, jlong canvasPtr,
-   jfloat ol, jfloat ot, jfloat oright, jfloat ob, jfloatArray ojradii,
-   jfloat il, jfloat it, jfloat ir, jfloat ib, jfloatArray ijradii,
+   jfloat ol, jfloat ot, jfloat oright, jfloat ob, jfloatArray ojradii, jint ojradiiSize,
+   jfloat il, jfloat it, jfloat ir, jfloat ib, jfloatArray ijradii, jint ijradiiSize,
    jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
@@ -245,7 +245,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nClipRect
 }
 
 extern "C" JNIEXPORT void JNICALL Java_org_jetbrains_skia_Canvas__1nClipRRect
-  (JNIEnv* env, jclass jclass, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloatArray jradii, jint mode, jboolean antiAlias) {
+  (JNIEnv* env, jclass jclass, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloatArray jradii, jint jradiiSize, jint mode, jboolean antiAlias) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     canvas->clipRRect(skija::RRect::toSkRRect(env, left, top, right, bottom, jradii), static_cast<SkClipOp>(mode), antiAlias);
 }

skiko/src/jvmMain/cpp/common/Path.cc

@@ -345,7 +345,7 @@ extern "C" JNIEXPORT void Java_org_jetbrains_skia_Path__1nAddArc
 }
 
 extern "C" JNIEXPORT void Java_org_jetbrains_skia_Path__1nAddRRect
-  (JNIEnv* env, jclass jclass, jlong ptr, jfloat l, jfloat t, jfloat r, jfloat b, jfloatArray radii, jint dirInt, jint start) {
+  (JNIEnv* env, jclass jclass, jlong ptr, jfloat l, jfloat t, jfloat r, jfloat b, jfloatArray radii, jint radiiSize, jint dirInt, jint start) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
     SkRRect rrect = skija::RRect::toSkRRect(env, l, t, r, b, radii);
     SkPathDirection dir = static_cast<SkPathDirection>(dirInt);

skiko/src/macosX64Main/cpp/common/BackendRenderTarget.cc

@@ -12,14 +12,14 @@ extern "C" jlong BackendRenderTarget_nGetFinalizer() {
 }
 
 extern "C" jlong BackendRenderTarget_nMakeGL
-  (jint width, jint height, jint sampleCnt, jint stencilBits, jint fbId, jint fbFormat) {
+  (kref __Kinstance, jint width, jint height, jint sampleCnt, jint stencilBits, jint fbId, jint fbFormat) {
     GrGLFramebufferInfo glInfo = { static_cast<unsigned int>(fbId), static_cast<unsigned int>(fbFormat) };
     GrBackendRenderTarget* instance = new GrBackendRenderTarget(width, height, sampleCnt, stencilBits, glInfo);
     return reinterpret_cast<jlong>(instance);
 }
 
 extern "C" jlong BackendRenderTarget_nMakeMetal
-  (jint width, jint height, jlong texturePtr) {
+  (kref __Kinstance, jint width, jint height, jlong texturePtr) {
 #ifdef SK_METAL
     GrMTLHandle texture = reinterpret_cast<GrMTLHandle>(static_cast<uintptr_t>(texturePtr));
     GrMtlTextureInfo fbInfo;
@@ -36,7 +36,7 @@ extern "C" jlong BackendRenderTarget_nMakeMetal
 #endif
 
 extern "C" jlong BackendRenderTarget_MakeDirect3D
-  (jint width, jint height, jlong texturePtr, jint format, jint sampleCnt, jint levelCnt) {
+  (kref __Kinstance, jint width, jint height, jlong texturePtr, jint format, jint sampleCnt, jint levelCnt) {
 #ifdef SK_DIRECT3D
     GrD3DTextureResourceInfo texResInfo = {};
     ID3D12Resource* resource = reinterpret_cast<ID3D12Resource*>(static_cast<uintptr_t>(texturePtr));

skiko/src/macosX64Main/cpp/common/native_interop.cc

+#include "common.h"
+#include "native_interop.h"
+
+std::unique_ptr<SkMatrix> skMatrix(jfloatArray matrixArray) {
+    if (matrixArray == nullptr)
+        return std::unique_ptr<SkMatrix>(nullptr);
+    else {
+        jfloat* m = static_cast<jfloat*>(matrixArray);
+        SkMatrix* ptr = new SkMatrix();
+        ptr->setAll(m[0], m[1], m[2], m[3], m[4], m[5], m[6], m[7], m[8]);
+        return std::unique_ptr<SkMatrix>(ptr);
+    }
+}
+
+std::unique_ptr<SkM44> skM44(jfloatArray matrixArray) {
+    if (matrixArray == nullptr)
+        return std::unique_ptr<SkM44>(nullptr);
+    else {
+        jfloat* m = static_cast<jfloat *>(matrixArray);
+        SkM44* ptr = new SkM44(m[0], m[1], m[2], m[3], m[4], m[5], m[6], m[7], m[8], m[9], m[10], m[11], m[12], m[13], m[14], m[15]);
+        return std::unique_ptr<SkM44>(ptr);
+    }
+}
+
+namespace skija {
+    namespace RRect {
+        SkRRect toSkRRect(jfloat left, jfloat top, jfloat right, jfloat bottom, jfloatArray jradii, jint radiiSize) {
+            SkRect rect {left, top, right, bottom};
+            SkRRect rrect = SkRRect::MakeEmpty();
+            jfloat* radii = static_cast<jfloat *>(jradii);
+            switch (radiiSize) {
+                case 1:
+                    rrect.setRectXY(rect, radii[0], radii[0]);
+                    break;
+                case 2:
+                    rrect.setRectXY(rect, radii[0], radii[1]);
+                    break;
+                case 4: {
+                    SkVector vradii[4] = {{radii[0], radii[0]}, {radii[1], radii[1]}, {radii[2], radii[2]}, {radii[3], radii[3]}};
+                    rrect.setRectRadii(rect, vradii);
+                    break;
+                }
+                case 8: {
+                    SkVector vradii[4] = {{radii[0], radii[1]}, {radii[2], radii[3]}, {radii[4], radii[5]}, {radii[6], radii[7]}};
+                    rrect.setRectRadii(rect, vradii);
+                    break;
+                }
+            }
+            return rrect;
+        }
+    }
+}

skiko/src/macosX64Main/cpp/generated/Bitmap.cc

@@ -37,7 +37,7 @@ extern "C" void org_jetbrains_skia_Bitmap__1nSwap
 
 extern "C" jobject org_jetbrains_skia_Bitmap__1nGetImageInfo
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Bitmap__1nGetImageInfo");
+    TODO("implement org_jetbrains_skia_Bitmap__1nGetImageInfo");
 }
      
 #if 0 
@@ -142,7 +142,7 @@ extern "C" jboolean org_jetbrains_skia_Bitmap__1nAllocPixelsRowBytes
 
 extern "C" jboolean org_jetbrains_skia_Bitmap__1nInstallPixels
   (kref __Kinstance, jlong ptr, jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr, jbyteArray pixelsArr, jlong rowBytes) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Bitmap__1nInstallPixels");
+    TODO("implement org_jetbrains_skia_Bitmap__1nInstallPixels");
 }
      
 #if 0 
@@ -244,7 +244,7 @@ extern "C" jboolean org_jetbrains_skia_Bitmap__1nExtractSubset
 
 extern "C" jbyteArray org_jetbrains_skia_Bitmap__1nReadPixels
   (kref __Kinstance, jlong ptr, jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr, jlong rowBytes, jint srcX, jint srcY) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Bitmap__1nReadPixels");
+    TODO("implement org_jetbrains_skia_Bitmap__1nReadPixels");
 }
      
 #if 0 
@@ -269,7 +269,7 @@ extern "C" jbyteArray org_jetbrains_skia_Bitmap__1nReadPixels
 
 extern "C" jobject org_jetbrains_skia_Bitmap__1nExtractAlpha
   (kref __Kinstance, jlong ptr, jlong dstPtr, jlong paintPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Bitmap__1nExtractAlpha");
+    TODO("implement org_jetbrains_skia_Bitmap__1nExtractAlpha");
 }
      
 #if 0 
@@ -290,7 +290,7 @@ extern "C" jobject org_jetbrains_skia_Bitmap__1nExtractAlpha
 
 extern "C" jobject org_jetbrains_skia_Bitmap__1nPeekPixels
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Bitmap__1nPeekPixels");
+    TODO("implement org_jetbrains_skia_Bitmap__1nPeekPixels");
 }
      
 #if 0 
@@ -309,7 +309,7 @@ extern "C" jobject org_jetbrains_skia_Bitmap__1nPeekPixels
 
 extern "C" jlong org_jetbrains_skia_Bitmap__1nMakeShader
   (kref __Kinstance, jlong ptr, jint tmx, jint tmy, jlong samplingMode, jfloatArray localMatrixArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Bitmap__1nMakeShader");
+    TODO("implement org_jetbrains_skia_Bitmap__1nMakeShader");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/BreakIterator.cc

@@ -15,7 +15,7 @@ extern "C" jlong org_jetbrains_skia_BreakIterator__1nGetFinalizer(kref __Kinstan
 
 extern "C" jlong org_jetbrains_skia_BreakIterator__1nMake
   (kref __Kinstance, jint type, jstring localeStr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_BreakIterator__1nMake");
+    TODO("implement org_jetbrains_skia_BreakIterator__1nMake");
 }
      
 #if 0 
@@ -42,7 +42,7 @@ extern "C" jlong org_jetbrains_skia_BreakIterator__1nMake
 
 extern "C" jint org_jetbrains_skia_BreakIterator__1nClone
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_BreakIterator__1nClone");
+    TODO("implement org_jetbrains_skia_BreakIterator__1nClone");
 }
      
 #if 0 
@@ -117,7 +117,7 @@ extern "C" jint org_jetbrains_skia_BreakIterator__1nGetRuleStatus
 
 extern "C" jintArray org_jetbrains_skia_BreakIterator__1nGetRuleStatuses
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_BreakIterator__1nGetRuleStatuses");
+    TODO("implement org_jetbrains_skia_BreakIterator__1nGetRuleStatuses");
 }
      
 #if 0 
@@ -140,7 +140,7 @@ extern "C" jintArray org_jetbrains_skia_BreakIterator__1nGetRuleStatuses
 
 extern "C" void org_jetbrains_skia_BreakIterator__1nSetText
   (kref __Kinstance, jlong ptr, jlong textPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_BreakIterator__1nSetText");
+    TODO("implement org_jetbrains_skia_BreakIterator__1nSetText");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/Canvas.cc

@@ -8,6 +8,7 @@
 #include "SkVertices.h"
 #include "hb.h"
 #include "common.h"
+#include "native_interop.h"
 
 static void deleteCanvas(SkCanvas* canvas) {
     // std::cout << "Deleting [SkCanvas " << canvas << "]" << std::endl;
@@ -35,7 +36,7 @@ extern "C" void org_jetbrains_skia_Canvas__1nDrawPoint
 
 extern "C" void org_jetbrains_skia_Canvas__1nDrawPoints
   (kref __Kinstance, jlong canvasPtr, int mode, jfloatArray coords, jlong paintPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Canvas__1nDrawPoints");
+    TODO("implement org_jetbrains_skia_Canvas__1nDrawPoints");
 }
      
 #if 0 
@@ -80,44 +81,23 @@ extern "C" void org_jetbrains_skia_Canvas__1nDrawOval
     canvas->drawOval({left, top, right, bottom}, *paint);
 }
 
-
-extern "C" void org_jetbrains_skia_Canvas__1nDrawRRect
-  (kref __Kinstance, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloatArray jradii, jlong paintPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Canvas__1nDrawRRect");
-}
-     
-#if 0 
 extern "C" void org_jetbrains_skia_Canvas__1nDrawRRect
-  (kref __Kinstance, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloatArray jradii, jlong paintPtr) {
+  (kref __Kinstance, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloatArray jradii, jint jradiiSize, jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
-    canvas->drawRRect(skija::RRect::toSkRRect(env, left, top, right, bottom, jradii), *paint);
+    canvas->drawRRect(skija::RRect::toSkRRect(left, top, right, bottom, jradii, jradiiSize), *paint);
 }
-#endif
 
-
-
-extern "C" void org_jetbrains_skia_Canvas__1nDrawDRRect
-  (kref __Kinstance, jlong canvasPtr,
-   jfloat ol, jfloat ot, jfloat oright, jfloat ob, jfloatArray ojradii,
-   jfloat il, jfloat it, jfloat ir, jfloat ib, jfloatArray ijradii,
-   jlong paintPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Canvas__1nDrawDRRect");
-}
-     
-#if 0 
 extern "C" void org_jetbrains_skia_Canvas__1nDrawDRRect
   (kref __Kinstance, jlong canvasPtr,
-   jfloat ol, jfloat ot, jfloat oright, jfloat ob, jfloatArray ojradii,
-   jfloat il, jfloat it, jfloat ir, jfloat ib, jfloatArray ijradii,
+   jfloat ol, jfloat ot, jfloat oright, jfloat ob, jfloatArray ojradii, jint ojradiiSize,
+   jfloat il, jfloat it, jfloat ir, jfloat ib, jfloatArray ijradii, jint ijradiiSize,
    jlong paintPtr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
     SkPaint* paint = reinterpret_cast<SkPaint*>(static_cast<uintptr_t>(paintPtr));
-    canvas->drawDRRect(skija::RRect::toSkRRect(env, ol, ot, oright, ob, ojradii),
-        skija::RRect::toSkRRect(env, il, it, ir, ib, ijradii), *paint);
+    canvas->drawDRRect(skija::RRect::toSkRRect(ol, ot, oright, ob, ojradii, ojradiiSize),
+        skija::RRect::toSkRRect(il, it, ir, ib, ijradii, ijradiiSize), *paint);
 }
-#endif
-
 
 extern "C" void org_jetbrains_skia_Canvas__1nDrawPath
   (kref __Kinstance, jlong canvasPtr, jlong pathPtr, jlong paintPtr) {
@@ -159,7 +139,7 @@ extern "C" void org_jetbrains_skia_Canvas__1nDrawRegion
 
 extern "C" void org_jetbrains_skia_Canvas__1nDrawString
   (kref __Kinstance, jlong canvasPtr, jstring stringObj, jfloat x, jfloat y, jlong skFontPtr, jlong paintPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Canvas__1nDrawString");
+    TODO("implement org_jetbrains_skia_Canvas__1nDrawString");
 }
      
 #if 0 
@@ -185,27 +165,19 @@ extern "C" void org_jetbrains_skia_Canvas__1nDrawTextBlob
 }
 
 
-extern "C" void org_jetbrains_skia_Canvas__1nDrawPicture
-  (kref __Kinstance, jlong ptr, jlong picturePtr, jfloatArray matrixArr, jlong paintPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Canvas__1nDrawPicture");
-}
-     
-#if 0 
 extern "C" void org_jetbrains_skia_Canvas__1nDrawPicture
   (kref __Kinstance, jlong ptr, jlong picturePtr, jfloatArray matrixArr, jlong paintPtr) {
     SkCanvas* canvas   = reinterpret_cast<SkCanvas*>   (static_cast<uintptr_t>(ptr));
     SkPicture* picture = reinterpret_cast<SkPicture*>(static_cast<uintptr_t>(picturePtr));
-    std::unique_ptr<SkMatrix> matrix = skMatrix(env, matrixArr);
+    std::unique_ptr<SkMatrix> matrix = skMatrix(matrixArr);
     SkPaint* paint     = reinterpret_cast<SkPaint*>    (static_cast<uintptr_t>(paintPtr));
     canvas->drawPicture(picture, matrix.get(), paint);
 }
-#endif
-
 
 
 extern "C" void org_jetbrains_skia_Canvas__1nDrawVertices
   (kref __Kinstance, jlong ptr, jint verticesMode, jfloatArray positionsArr, jintArray colorsArr, jfloatArray texCoordsArr, jshortArray indexArr, jint blendMode, jlong paintPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Canvas__1nDrawVertices");
+    TODO("implement org_jetbrains_skia_Canvas__1nDrawVertices");
 }
      
 #if 0 
@@ -241,7 +213,7 @@ extern "C" void org_jetbrains_skia_Canvas__1nDrawVertices
 
 extern "C" void org_jetbrains_skia_Canvas__1nDrawPatch
   (kref __Kinstance, jlong ptr, jfloatArray cubicsArr, jintArray colorsArr, jfloatArray texCoordsArr, jint blendMode, jlong paintPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Canvas__1nDrawPatch");
+    TODO("implement org_jetbrains_skia_Canvas__1nDrawPatch");
 }
      
 #if 0 
@@ -266,7 +238,7 @@ extern "C" void org_jetbrains_skia_Canvas__1nDrawPatch
 
 extern "C" void org_jetbrains_skia_Canvas__1nDrawDrawable
   (kref __Kinstance, jlong ptr, jlong drawablePtr, jfloatArray matrixArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Canvas__1nDrawDrawable");
+    TODO("implement org_jetbrains_skia_Canvas__1nDrawDrawable");
 }
      
 #if 0 
@@ -295,7 +267,7 @@ extern "C" void org_jetbrains_skia_Canvas__1nDrawPaint
 
 extern "C" void org_jetbrains_skia_Canvas__1nSetMatrix
   (kref __Kinstance, jlong canvasPtr, jfloatArray matrixArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Canvas__1nSetMatrix");
+    TODO("implement org_jetbrains_skia_Canvas__1nSetMatrix");
 }
      
 #if 0 
@@ -317,7 +289,7 @@ extern "C" void org_jetbrains_skia_Canvas__1nResetMatrix
 
 extern "C" jobject org_jetbrains_skia_Canvas__1nGetLocalToDevice
 (kref __Kinstance, jlong canvasPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Canvas__1nGetLocalToDevice");
+    TODO("implement org_jetbrains_skia_Canvas__1nGetLocalToDevice");
 }
      
 #if 0 
@@ -338,20 +310,11 @@ extern "C" void org_jetbrains_skia_Canvas__1nClipRect
     canvas->clipRect({left, top, right, bottom}, static_cast<SkClipOp>(mode), antiAlias);
 }
 
-
 extern "C" void org_jetbrains_skia_Canvas__1nClipRRect
-  (kref __Kinstance, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloatArray jradii, jint mode, jboolean antiAlias) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Canvas__1nClipRRect");
-}
-     
-#if 0 
-extern "C" void org_jetbrains_skia_Canvas__1nClipRRect
-  (kref __Kinstance, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloatArray jradii, jint mode, jboolean antiAlias) {
+  (kref __Kinstance, jlong canvasPtr, jfloat left, jfloat top, jfloat right, jfloat bottom, jfloatArray jradii, jint jradiiSize, jint mode, jboolean antiAlias) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(canvasPtr));
-    canvas->clipRRect(skija::RRect::toSkRRect(env, left, top, right, bottom, jradii), static_cast<SkClipOp>(mode), antiAlias);
+    canvas->clipRRect(skija::RRect::toSkRRect(left, top, right, bottom, jradii, jradiiSize), static_cast<SkClipOp>(mode), antiAlias);
 }
-#endif
-
 
 extern "C" void org_jetbrains_skia_Canvas__1nClipPath
   (kref __Kinstance, jlong canvasPtr, jlong pathPtr, jint mode, jboolean antiAlias) {
@@ -368,35 +331,20 @@ extern "C" void org_jetbrains_skia_Canvas__1nClipRegion
 }
 
 
-extern "C" void org_jetbrains_skia_Canvas__1nConcat
-  (kref __Kinstance, jlong ptr, jfloatArray matrixArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Canvas__1nConcat");
-}
-     
-#if 0 
 extern "C" void org_jetbrains_skia_Canvas__1nConcat
   (kref __Kinstance, jlong ptr, jfloatArray matrixArr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(ptr));
-    std::unique_ptr<SkMatrix> m = skMatrix(env, matrixArr);
+    std::unique_ptr<SkMatrix> m = skMatrix(matrixArr);
     canvas->concat(*m);
 }
-#endif
-
 
 
-extern "C" void org_jetbrains_skia_Canvas__1nConcat44
-  (kref __Kinstance, jlong ptr, jfloatArray matrixArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Canvas__1nConcat44");
-}
-     
-#if 0 
 extern "C" void org_jetbrains_skia_Canvas__1nConcat44
   (kref __Kinstance, jlong ptr, jfloatArray matrixArr) {
     SkCanvas* canvas = reinterpret_cast<SkCanvas*>(static_cast<uintptr_t>(ptr));
-    std::unique_ptr<SkM44> m = skM44(env, matrixArr);
+    std::unique_ptr<SkM44> m = skM44(matrixArr);
     canvas->concat(*m);
 }
-#endif
 
 
 extern "C" jint org_jetbrains_skia_Canvas__1nReadPixels

skiko/src/macosX64Main/cpp/generated/Codec.cc

@@ -25,7 +25,7 @@ extern "C" jlong org_jetbrains_skia_Codec__1nMakeFromData
 
 extern "C" jobject org_jetbrains_skia_Codec__1nGetImageInfo
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Codec__1nGetImageInfo");
+    TODO("implement org_jetbrains_skia_Codec__1nGetImageInfo");
 }
      
 #if 0 
@@ -75,7 +75,7 @@ extern "C" jint org_jetbrains_skia_Codec__1nGetFrameCount
 
 extern "C" jobject org_jetbrains_skia_Codec__1nGetFrameInfo
   (kref __Kinstance, jlong ptr, jint frame) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Codec__1nGetFrameInfo");
+    TODO("implement org_jetbrains_skia_Codec__1nGetFrameInfo");
 }
      
 #if 0 
@@ -92,7 +92,7 @@ extern "C" jobject org_jetbrains_skia_Codec__1nGetFrameInfo
 
 extern "C" jobject org_jetbrains_skia_Codec__1nGetFramesInfo
   (kref __Kinstance, jlong ptr, jint frame) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Codec__1nGetFramesInfo");
+    TODO("implement org_jetbrains_skia_Codec__1nGetFramesInfo");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/ColorFilter.cc

@@ -29,7 +29,7 @@ extern "C" jlong org_jetbrains_skia_ColorFilter__1nMakeBlend
 
 extern "C" jlong org_jetbrains_skia_ColorFilter__1nMakeMatrix
   (kref __Kinstance, jfloatArray rowMajorArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ColorFilter__1nMakeMatrix");
+    TODO("implement org_jetbrains_skia_ColorFilter__1nMakeMatrix");
 }
      
 #if 0 
@@ -46,7 +46,7 @@ extern "C" jlong org_jetbrains_skia_ColorFilter__1nMakeMatrix
 
 extern "C" jlong org_jetbrains_skia_ColorFilter__1nMakeHSLAMatrix
   (kref __Kinstance, jfloatArray rowMajorArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ColorFilter__1nMakeHSLAMatrix");
+    TODO("implement org_jetbrains_skia_ColorFilter__1nMakeHSLAMatrix");
 }
      
 #if 0 
@@ -96,7 +96,7 @@ extern "C" jlong org_jetbrains_skia_ColorFilter__1nMakeHighContrast
 
 extern "C" jlong org_jetbrains_skia_ColorFilter__1nMakeTable
   (kref __Kinstance, jbyteArray tableArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ColorFilter__1nMakeTable");
+    TODO("implement org_jetbrains_skia_ColorFilter__1nMakeTable");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/Data.cc

@@ -22,7 +22,7 @@ extern "C" jlong org_jetbrains_skia_Data__1nSize
 
 extern "C" jobject org_jetbrains_skia_Data__1nToByteBuffer
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Data__1nToByteBuffer");
+    TODO("implement org_jetbrains_skia_Data__1nToByteBuffer");
 }
      
 #if 0 
@@ -37,7 +37,7 @@ extern "C" jobject org_jetbrains_skia_Data__1nToByteBuffer
 
 extern "C" jbyteArray org_jetbrains_skia_Data__1nBytes
   (kref __Kinstance, jlong ptr, jlong offset, jlong length) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Data__1nBytes");
+    TODO("implement org_jetbrains_skia_Data__1nBytes");
 }
      
 #if 0 
@@ -62,7 +62,7 @@ extern "C" jboolean org_jetbrains_skia_Data__1nEquals
 
 extern "C" jlong org_jetbrains_skia_Data__1nMakeFromBytes
   (kref __Kinstance, jbyteArray bytesArray, jlong offset, jlong length) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Data__1nMakeFromBytes");
+    TODO("implement org_jetbrains_skia_Data__1nMakeFromBytes");
 }
      
 #if 0 
@@ -80,7 +80,7 @@ extern "C" jlong org_jetbrains_skia_Data__1nMakeFromBytes
 
 extern "C" jlong org_jetbrains_skia_Data__1nMakeFromFileName
   (kref __Kinstance, jstring pathStr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Data__1nMakeFromFileName");
+    TODO("implement org_jetbrains_skia_Data__1nMakeFromFileName");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/DirectContext.cc

@@ -25,7 +25,7 @@ extern "C" jlong org_jetbrains_skia_DirectContext__1nMakeMetal
 
 extern "C" jlong org_jetbrains_skia_DirectContext__1nMakeDirect3D
   (kref __Kinstance, jlong adapterPtr, jlong devicePtr, jlong queuePtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_DirectContext__1nMakeDirect3D");
+    TODO("implement org_jetbrains_skia_DirectContext__1nMakeDirect3D");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/Drawable.cc

@@ -8,7 +8,7 @@
 
 extern "C" jlong org_jetbrains_skia_Drawable__1nMake
   (kref __Kinstance) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Drawable__1nMake");
+    TODO("implement org_jetbrains_skia_Drawable__1nMake");
 }
      
 #if 0 
@@ -23,7 +23,7 @@ extern "C" jlong org_jetbrains_skia_Drawable__1nMake
 
 extern "C" void org_jetbrains_skia_Drawable__1nInit
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Drawable__1nInit");
+    TODO("implement org_jetbrains_skia_Drawable__1nInit");
 }
      
 #if 0 
@@ -38,7 +38,7 @@ extern "C" void org_jetbrains_skia_Drawable__1nInit
 
 extern "C" void org_jetbrains_skia_Drawable__1nDraw
   (kref __Kinstance, jlong ptr, jlong canvasPtr, jfloatArray matrixArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Drawable__1nDraw");
+    TODO("implement org_jetbrains_skia_Drawable__1nDraw");
 }
      
 #if 0 
@@ -55,7 +55,7 @@ extern "C" void org_jetbrains_skia_Drawable__1nDraw
 
 extern "C" jlong org_jetbrains_skia_Drawable__1nMakePictureSnapshot
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Drawable__1nMakePictureSnapshot");
+    TODO("implement org_jetbrains_skia_Drawable__1nMakePictureSnapshot");
 }
      
 #if 0 
@@ -70,7 +70,7 @@ extern "C" jlong org_jetbrains_skia_Drawable__1nMakePictureSnapshot
 
 extern "C" jint org_jetbrains_skia_Drawable__1nGetGenerationId
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Drawable__1nGetGenerationId");
+    TODO("implement org_jetbrains_skia_Drawable__1nGetGenerationId");
 }
      
 #if 0 
@@ -85,7 +85,7 @@ extern "C" jint org_jetbrains_skia_Drawable__1nGetGenerationId
 
 extern "C" void org_jetbrains_skia_Drawable__1nNotifyDrawingChanged
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Drawable__1nNotifyDrawingChanged");
+    TODO("implement org_jetbrains_skia_Drawable__1nNotifyDrawingChanged");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/Font.cc

@@ -213,7 +213,7 @@ extern "C" void org_jetbrains_skia_Font__1nSetSkewX
 
 extern "C" jshortArray org_jetbrains_skia_Font__1nGetStringGlyphs
   (kref __Kinstance, jlong ptr, jstring str) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Font__1nGetStringGlyphs");
+    TODO("implement org_jetbrains_skia_Font__1nGetStringGlyphs");
 }
      
 #if 0 
@@ -234,7 +234,7 @@ extern "C" jshortArray org_jetbrains_skia_Font__1nGetStringGlyphs
 
 extern "C" jshortArray org_jetbrains_skia_Font__1nGetUTF32Glyphs
   (kref __Kinstance, jlong ptr, jintArray uniArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Font__1nGetUTF32Glyphs");
+    TODO("implement org_jetbrains_skia_Font__1nGetUTF32Glyphs");
 }
      
 #if 0 
@@ -260,7 +260,7 @@ extern "C" jshort org_jetbrains_skia_Font__1nGetUTF32Glyph
 
 extern "C" jint org_jetbrains_skia_Font__1nGetStringGlyphsCount
   (kref __Kinstance, jlong ptr, jstring str) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Font__1nGetStringGlyphsCount");
+    TODO("implement org_jetbrains_skia_Font__1nGetStringGlyphsCount");
 }
      
 #if 0 
@@ -279,7 +279,7 @@ extern "C" jint org_jetbrains_skia_Font__1nGetStringGlyphsCount
 
 extern "C" jobject org_jetbrains_skia_Font__1nMeasureText
   (kref __Kinstance, jlong ptr, jstring str, jlong paintPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Font__1nMeasureText");
+    TODO("implement org_jetbrains_skia_Font__1nMeasureText");
 }
      
 #if 0 
@@ -300,7 +300,7 @@ extern "C" jobject org_jetbrains_skia_Font__1nMeasureText
 
 extern "C" jfloat org_jetbrains_skia_Font__1nMeasureTextWidth
   (kref __Kinstance, jlong ptr, jstring str, jlong paintPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Font__1nMeasureTextWidth");
+    TODO("implement org_jetbrains_skia_Font__1nMeasureTextWidth");
 }
      
 #if 0 
@@ -320,7 +320,7 @@ extern "C" jfloat org_jetbrains_skia_Font__1nMeasureTextWidth
 
 extern "C" jfloatArray org_jetbrains_skia_Font__1nGetWidths
   (kref __Kinstance, jlong ptr, jshortArray glyphsArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Font__1nGetWidths");
+    TODO("implement org_jetbrains_skia_Font__1nGetWidths");
 }
      
 #if 0 
@@ -340,7 +340,7 @@ extern "C" jfloatArray org_jetbrains_skia_Font__1nGetWidths
 
 extern "C" jobjectArray org_jetbrains_skia_Font__1nGetBounds
   (kref __Kinstance, jlong ptr, jshortArray glyphsArr, jlong paintPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Font__1nGetBounds");
+    TODO("implement org_jetbrains_skia_Font__1nGetBounds");
 }
      
 #if 0 
@@ -368,7 +368,7 @@ extern "C" jobjectArray org_jetbrains_skia_Font__1nGetBounds
 
 extern "C" jobjectArray org_jetbrains_skia_Font__1nGetPositions
   (kref __Kinstance, jlong ptr, jshortArray glyphsArr, jfloat dx, jfloat dy) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Font__1nGetPositions");
+    TODO("implement org_jetbrains_skia_Font__1nGetPositions");
 }
      
 #if 0 
@@ -390,7 +390,7 @@ extern "C" jobjectArray org_jetbrains_skia_Font__1nGetPositions
 
 extern "C" jfloatArray org_jetbrains_skia_Font__1nGetXPositions
   (kref __Kinstance, jlong ptr, jshortArray glyphsArr, jfloat dx) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Font__1nGetXPositions");
+    TODO("implement org_jetbrains_skia_Font__1nGetXPositions");
 }
      
 #if 0 
@@ -418,7 +418,7 @@ extern "C" jlong org_jetbrains_skia_Font__1nGetPath
 
 extern "C" jobjectArray org_jetbrains_skia_Font__1nGetPaths
   (kref __Kinstance, jlong ptr, jshortArray glyphsArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Font__1nGetPaths");
+    TODO("implement org_jetbrains_skia_Font__1nGetPaths");
 }
      
 #if 0 
@@ -456,7 +456,7 @@ extern "C" jobjectArray org_jetbrains_skia_Font__1nGetPaths
 
 extern "C" jobject org_jetbrains_skia_Font__1nGetMetrics
   (kref __Kinstance, jlong ptr, jshortArray glyphsArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Font__1nGetMetrics");
+    TODO("implement org_jetbrains_skia_Font__1nGetMetrics");
 }
      
 #if 0 
@@ -473,7 +473,7 @@ extern "C" jobject org_jetbrains_skia_Font__1nGetMetrics
 
 extern "C" jfloat org_jetbrains_skia_Font__1nGetSpacing
   (kref __Kinstance, jlong ptr, jshortArray glyphsArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Font__1nGetSpacing");
+    TODO("implement org_jetbrains_skia_Font__1nGetSpacing");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/FontMgr.cc

@@ -16,7 +16,7 @@ extern "C" jint org_jetbrains_skia_FontMgr__1nGetFamiliesCount
 
 extern "C" jstring org_jetbrains_skia_FontMgr__1nGetFamilyName
   (kref __Kinstance, jlong ptr, jint index) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_FontMgr__1nGetFamilyName");
+    TODO("implement org_jetbrains_skia_FontMgr__1nGetFamilyName");
 }
      
 #if 0 
@@ -40,7 +40,7 @@ extern "C" jlong org_jetbrains_skia_FontMgr__1nMakeStyleSet
 
 extern "C" jlong org_jetbrains_skia_FontMgr__1nMatchFamily
   (kref __Kinstance, jlong ptr, jstring familyNameStr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_FontMgr__1nMatchFamily");
+    TODO("implement org_jetbrains_skia_FontMgr__1nMatchFamily");
 }
      
 #if 0 
@@ -57,7 +57,7 @@ extern "C" jlong org_jetbrains_skia_FontMgr__1nMatchFamily
 
 extern "C" jlong org_jetbrains_skia_FontMgr__1nMatchFamilyStyle
   (kref __Kinstance, jlong ptr, jstring familyNameStr, jint fontStyle) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_FontMgr__1nMatchFamilyStyle");
+    TODO("implement org_jetbrains_skia_FontMgr__1nMatchFamilyStyle");
 }
      
 #if 0 
@@ -74,7 +74,7 @@ extern "C" jlong org_jetbrains_skia_FontMgr__1nMatchFamilyStyle
 
 extern "C" jlong org_jetbrains_skia_FontMgr__1nMatchFamilyStyleCharacter
   (kref __Kinstance, jlong ptr, jstring familyNameStr, jint fontStyle, jobjectArray bcp47Array, jint character) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_FontMgr__1nMatchFamilyStyleCharacter");
+    TODO("implement org_jetbrains_skia_FontMgr__1nMatchFamilyStyleCharacter");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/FontStyleSet.cc

@@ -29,7 +29,7 @@ extern "C" jint org_jetbrains_skia_FontStyleSet__1nGetStyle
 
 extern "C" jstring org_jetbrains_skia_FontStyleSet__1nGetStyleName
   (kref __Kinstance, jlong ptr, jint index) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_FontStyleSet__1nGetStyleName");
+    TODO("implement org_jetbrains_skia_FontStyleSet__1nGetStyleName");
 }
      
 #if 0 
@@ -53,7 +53,7 @@ extern "C" jlong org_jetbrains_skia_FontStyleSet__1nGetTypeface
 
 extern "C" jlong org_jetbrains_skia_FontStyleSet__1nMatchStyle
   (kref __Kinstance, jlong ptr, jint fontStyle) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_FontStyleSet__1nMatchStyle");
+    TODO("implement org_jetbrains_skia_FontStyleSet__1nMatchStyle");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/Image.cc

@@ -9,7 +9,7 @@
 
 extern "C" jlong org_jetbrains_skia_Image__1nMakeRaster
   (kref __Kinstance, jint width, jint height, jint colorType, jint alphaType, jlong colorSpacePtr, jbyteArray bytesArr, jlong rowBytes) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Image__1nMakeRaster");
+    TODO("implement org_jetbrains_skia_Image__1nMakeRaster");
 }
      
 #if 0 
@@ -59,7 +59,7 @@ extern "C" jlong org_jetbrains_skia_Image__1nMakeFromPixmap
 
 extern "C" jlong org_jetbrains_skia_Image__1nMakeFromEncoded
   (kref __Kinstance, jbyteArray encodedArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Image__1nMakeFromEncoded");
+    TODO("implement org_jetbrains_skia_Image__1nMakeFromEncoded");
 }
      
 #if 0 
@@ -80,7 +80,7 @@ extern "C" jlong org_jetbrains_skia_Image__1nMakeFromEncoded
 
 extern "C" jobject org_jetbrains_skia_Image__1nGetImageInfo
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Image__1nGetImageInfo");
+    TODO("implement org_jetbrains_skia_Image__1nGetImageInfo");
 }
      
 #if 0 
@@ -102,7 +102,7 @@ extern "C" jlong org_jetbrains_skia_Image__1nEncodeToData
 
 extern "C" jlong org_jetbrains_skia_Image__1nMakeShader
   (kref __Kinstance, jlong ptr, jint tmx, jint tmy, jlong sampling, jfloatArray localMatrixArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Image__1nMakeShader");
+    TODO("implement org_jetbrains_skia_Image__1nMakeShader");
 }
      
 #if 0 
@@ -119,7 +119,7 @@ extern "C" jlong org_jetbrains_skia_Image__1nMakeShader
 
 extern "C" jobject org_jetbrains_skia_Image__1nPeekPixels
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Image__1nPeekPixels");
+    TODO("implement org_jetbrains_skia_Image__1nPeekPixels");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/ImageFilter.cc

@@ -12,7 +12,7 @@
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeAlphaThreshold
   (kref __Kinstance, jlong regionPtr, jfloat innerMin, jfloat outerMax, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeAlphaThreshold");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeAlphaThreshold");
 }
      
 #if 0 
@@ -30,7 +30,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeAlphaThreshold
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeArithmetic
   (kref __Kinstance, jfloat k1, jfloat k2, jfloat k3, jfloat k4, jboolean enforcePMColor, jlong bgPtr, jlong fgPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeArithmetic");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeArithmetic");
 }
      
 #if 0 
@@ -48,7 +48,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeArithmetic
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeBlend
   (kref __Kinstance, jint blendModeInt, jlong bgPtr, jlong fgPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeBlend");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeBlend");
 }
      
 #if 0 
@@ -67,7 +67,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeBlend
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeBlur
   (kref __Kinstance, jfloat sigmaX, jfloat sigmaY, jint tileModeInt, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeBlur");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeBlur");
 }
      
 #if 0 
@@ -85,7 +85,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeBlur
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeColorFilter
   (kref __Kinstance, jlong colorFilterPtr, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeColorFilter");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeColorFilter");
 }
      
 #if 0 
@@ -111,7 +111,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeCompose
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeDisplacementMap
   (kref __Kinstance, jint xChanInt, jint yChanInt, jfloat scale, jlong displacementPtr, jlong colorPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeDisplacementMap");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeDisplacementMap");
 }
      
 #if 0 
@@ -131,7 +131,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeDisplacementMap
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeDropShadow
   (kref __Kinstance, jfloat dx, jfloat dy, jfloat sigmaX, jfloat sigmaY, jint color, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeDropShadow");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeDropShadow");
 }
      
 #if 0 
@@ -148,7 +148,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeDropShadow
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeDropShadowOnly
   (kref __Kinstance, jfloat dx, jfloat dy, jfloat sigmaX, jfloat sigmaY, jint color, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeDropShadowOnly");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeDropShadowOnly");
 }
      
 #if 0 
@@ -172,7 +172,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeImage
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeMagnifier
   (kref __Kinstance, jfloat l, jfloat t, jfloat r, jfloat b, jfloat inset, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeMagnifier");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeMagnifier");
 }
      
 #if 0 
@@ -189,7 +189,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeMagnifier
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeMatrixConvolution
   (kref __Kinstance, jint kernelW, jint kernelH, jfloatArray kernelArray, jfloat gain, jfloat bias, jint offsetX, jint offsetY, jint tileModeInt, jboolean convolveAlpha, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeMatrixConvolution");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeMatrixConvolution");
 }
      
 #if 0 
@@ -209,7 +209,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeMatrixConvolution
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeMatrixTransform
   (kref __Kinstance, jfloatArray matrixArray, jlong samplingMode, jlong inputPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeMatrixTransform");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeMatrixTransform");
 }
      
 #if 0 
@@ -226,7 +226,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeMatrixTransform
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeMerge
   (kref __Kinstance, jlongArray filtersArray, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeMerge");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeMerge");
 }
      
 #if 0 
@@ -250,7 +250,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeMerge
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeOffset
   (kref __Kinstance, jfloat dx, jfloat dy, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeOffset");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeOffset");
 }
      
 #if 0 
@@ -267,7 +267,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeOffset
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakePaint
   (kref __Kinstance, jlong paintPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakePaint");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakePaint");
 }
      
 #if 0 
@@ -298,7 +298,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeTile
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeDilate
   (kref __Kinstance, float rx, jfloat ry, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeDilate");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeDilate");
 }
      
 #if 0 
@@ -315,7 +315,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeDilate
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeErode
   (kref __Kinstance, float rx, jfloat ry, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeErode");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeErode");
 }
      
 #if 0 
@@ -332,7 +332,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeErode
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeDistantLitDiffuse
   (kref __Kinstance, jfloat x, jfloat y, jfloat z, jint lightColor, jfloat surfaceScale, jfloat kd, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeDistantLitDiffuse");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeDistantLitDiffuse");
 }
      
 #if 0 
@@ -349,7 +349,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeDistantLitDiffuse
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakePointLitDiffuse
   (kref __Kinstance, jfloat x, jfloat y, jfloat z, jint lightColor, jfloat surfaceScale, jfloat kd, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakePointLitDiffuse");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakePointLitDiffuse");
 }
      
 #if 0 
@@ -366,7 +366,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakePointLitDiffuse
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeSpotLitDiffuse
   (kref __Kinstance, jfloat x0, jfloat y0, jfloat z0, jfloat x1, jfloat y1, jfloat z1, jfloat falloffExponent, jfloat cutoffAngle, jint lightColor, jfloat surfaceScale, jfloat kd, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeSpotLitDiffuse");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeSpotLitDiffuse");
 }
      
 #if 0 
@@ -383,7 +383,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeSpotLitDiffuse
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeDistantLitSpecular
   (kref __Kinstance, jfloat x, jfloat y, jfloat z, jint lightColor, jfloat surfaceScale, jfloat ks, jfloat shininess, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeDistantLitSpecular");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeDistantLitSpecular");
 }
      
 #if 0 
@@ -400,7 +400,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeDistantLitSpecular
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakePointLitSpecular
   (kref __Kinstance, jfloat x, jfloat y, jfloat z, jint lightColor, jfloat surfaceScale, jfloat ks, jfloat shininess, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakePointLitSpecular");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakePointLitSpecular");
 }
      
 #if 0 
@@ -417,7 +417,7 @@ extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakePointLitSpecular
 
 extern "C" jlong org_jetbrains_skia_ImageFilter__1nMakeSpotLitSpecular
   (kref __Kinstance, jfloat x0, jfloat y0, jfloat z0, jfloat x1, jfloat y1, jfloat z1, jfloat falloffExponent, jfloat cutoffAngle, jint lightColor, jfloat surfaceScale, jfloat ks, jfloat shininess, jlong inputPtr, jobject cropObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ImageFilter__1nMakeSpotLitSpecular");
+    TODO("implement org_jetbrains_skia_ImageFilter__1nMakeSpotLitSpecular");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/ManagedString.cc

@@ -16,7 +16,7 @@ extern "C" jlong org_jetbrains_skia_ManagedString__1nGetFinalizer
 
 extern "C" jlong org_jetbrains_skia_ManagedString__1nMake
   (kref __Kinstance, jstring textStr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ManagedString__1nMake");
+    TODO("implement org_jetbrains_skia_ManagedString__1nMake");
 }
      
 #if 0 
@@ -31,7 +31,7 @@ extern "C" jlong org_jetbrains_skia_ManagedString__1nMake
 
 extern "C" jobject org_jetbrains_skia_ManagedString__1nToString
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ManagedString__1nToString");
+    TODO("implement org_jetbrains_skia_ManagedString__1nToString");
 }
      
 #if 0 
@@ -46,7 +46,7 @@ extern "C" jobject org_jetbrains_skia_ManagedString__1nToString
 
 extern "C" void org_jetbrains_skia_ManagedString__1nInsert
   (kref __Kinstance, jlong ptr, jint offset, jstring s) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ManagedString__1nInsert");
+    TODO("implement org_jetbrains_skia_ManagedString__1nInsert");
 }
      
 #if 0 
@@ -62,7 +62,7 @@ extern "C" void org_jetbrains_skia_ManagedString__1nInsert
 
 extern "C" void org_jetbrains_skia_ManagedString__1nAppend
   (kref __Kinstance, jlong ptr, jstring s) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_ManagedString__1nAppend");
+    TODO("implement org_jetbrains_skia_ManagedString__1nAppend");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/MaskFilter.cc

@@ -25,7 +25,7 @@ extern "C" jlong org_jetbrains_skia_MaskFilter__1nMakeShader
 
 extern "C" jlong org_jetbrains_skia_MaskFilter__1nMakeTable
   (kref __Kinstance, jbyteArray tableArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_MaskFilter__1nMakeTable");
+    TODO("implement org_jetbrains_skia_MaskFilter__1nMakeTable");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/OutputWStream.cc

@@ -8,7 +8,7 @@
 
 extern "C" jlong org_jetbrains_skia_OutputWStream__1nGetFinalizer
   (kref __Kinstance) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_OutputWStream__1nGetFinalizer");
+    TODO("implement org_jetbrains_skia_OutputWStream__1nGetFinalizer");
 }
      
 #if 0 
@@ -22,7 +22,7 @@ extern "C" jlong org_jetbrains_skia_OutputWStream__1nGetFinalizer
 
 extern "C" jlong org_jetbrains_skia_OutputWStream__1nMake
   (kref __Kinstance, jobject outputStream) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_OutputWStream__1nMake");
+    TODO("implement org_jetbrains_skia_OutputWStream__1nMake");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/Paint.cc

@@ -86,7 +86,7 @@ extern "C" void org_jetbrains_skia_Paint__1nSetColor
 
 extern "C" jobject org_jetbrains_skia_Paint__1nGetColor4f
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Paint__1nGetColor4f");
+    TODO("implement org_jetbrains_skia_Paint__1nGetColor4f");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/PaintFilterCanvas.cc

@@ -10,7 +10,7 @@
 
 extern "C" void org_jetbrains_skia_PaintFilterCanvas__1nAttachToJava
   (kref __Kinstance, jlong canvasPtr, jboolean unrollDrawable) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_PaintFilterCanvas__1nAttachToJava");
+    TODO("implement org_jetbrains_skia_PaintFilterCanvas__1nAttachToJava");
 }
      
 #if 0 
@@ -25,7 +25,7 @@ extern "C" void org_jetbrains_skia_PaintFilterCanvas__1nAttachToJava
 
 extern "C" jlong org_jetbrains_skia_PaintFilterCanvas__1nMake
   (kref __Kinstance, jlong canvasPtr, jboolean unrollDrawable) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_PaintFilterCanvas__1nMake");
+    TODO("implement org_jetbrains_skia_PaintFilterCanvas__1nMake");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/Path.cc

@@ -9,6 +9,7 @@
 #include "SkPathOps.h"
 #include "include/utils/SkParsePath.h"
 #include "common.h"
+#include "native_interop.h"
 
 static void deletePath(SkPath* path) {
     // std::cout << "Deleting [SkPath " << path << "]" << std::endl;
@@ -27,7 +28,7 @@ extern "C" jlong org_jetbrains_skia_Path__1nMake(kref __Kinstance) {
 
 extern "C" jlong org_jetbrains_skia_Path__1nMakeFromSVGString
   (kref __Kinstance, jstring d) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nMakeFromSVGString");
+    TODO("implement org_jetbrains_skia_Path__1nMakeFromSVGString");
 }
      
 #if 0 
@@ -86,7 +87,7 @@ extern "C" jboolean org_jetbrains_skia_Path__1nIsConvex(kref __Kinstance, jlong
 
 
 extern "C" jobject org_jetbrains_skia_Path__1nIsOval(kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nIsOval(kref");
+    TODO("implement org_jetbrains_skia_Path__1nIsOval(kref");
 }
      
 #if 0 
@@ -103,7 +104,7 @@ extern "C" jobject org_jetbrains_skia_Path__1nIsOval(kref __Kinstance, jlong ptr
 
 
 extern "C" jobject org_jetbrains_skia_Path__1nIsRRect(kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nIsRRect(kref");
+    TODO("implement org_jetbrains_skia_Path__1nIsRRect(kref");
 }
      
 #if 0 
@@ -167,7 +168,7 @@ extern "C" jboolean org_jetbrains_skia_Path__1nIsCubicDegenerate(kref __Kinstanc
 
 
 extern "C" jobjectArray org_jetbrains_skia_Path__1nMaybeGetAsLine(kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nMaybeGetAsLine(kref");
+    TODO("implement org_jetbrains_skia_Path__1nMaybeGetAsLine(kref");
 }
      
 #if 0 
@@ -192,7 +193,7 @@ extern "C" jint org_jetbrains_skia_Path__1nGetPointsCount(kref __Kinstance, jlon
 
 
 extern "C" jobject org_jetbrains_skia_Path__1nGetPoint(kref __Kinstance, jlong ptr, jint index) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nGetPoint(kref");
+    TODO("implement org_jetbrains_skia_Path__1nGetPoint(kref");
 }
      
 #if 0 
@@ -206,7 +207,7 @@ extern "C" jobject org_jetbrains_skia_Path__1nGetPoint(kref __Kinstance, jlong p
 
 
 extern "C" jint org_jetbrains_skia_Path__1nGetPoints(kref __Kinstance, jlong ptr, jobjectArray pointsArray, jint max) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nGetPoints(kref");
+    TODO("implement org_jetbrains_skia_Path__1nGetPoints(kref");
 }
      
 #if 0 
@@ -228,7 +229,7 @@ extern "C" jint org_jetbrains_skia_Path__1nCountVerbs(kref __Kinstance, jlong pt
 
 
 extern "C" jint org_jetbrains_skia_Path__1nGetVerbs(kref __Kinstance, jlong ptr, jbyteArray verbsArray, jint max) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nGetVerbs(kref");
+    TODO("implement org_jetbrains_skia_Path__1nGetVerbs(kref");
 }
      
 #if 0 
@@ -256,7 +257,7 @@ extern "C" void org_jetbrains_skia_Path__1nSwap(kref __Kinstance, jlong ptr, jlo
 
 
 extern "C" jobject org_jetbrains_skia_Path__1nGetBounds(kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nGetBounds(kref");
+    TODO("implement org_jetbrains_skia_Path__1nGetBounds(kref");
 }
      
 #if 0 
@@ -274,7 +275,7 @@ extern "C" void org_jetbrains_skia_Path__1nUpdateBoundsCache(kref __Kinstance, j
 
 
 extern "C" jobject org_jetbrains_skia_Path__1nComputeTightBounds(kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nComputeTightBounds(kref");
+    TODO("implement org_jetbrains_skia_Path__1nComputeTightBounds(kref");
 }
      
 #if 0 
@@ -374,7 +375,7 @@ extern "C" void org_jetbrains_skia_Path__1nClosePath(kref __Kinstance, jlong ptr
 
 extern "C" jobjectArray org_jetbrains_skia_Path__1nConvertConicToQuads
   (kref __Kinstance, jfloat x0, jfloat y0, jfloat x1, jfloat y1, jfloat x2, jfloat y2, jfloat w, jint pow2) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nConvertConicToQuads");
+    TODO("implement org_jetbrains_skia_Path__1nConvertConicToQuads");
 }
      
 #if 0 
@@ -394,7 +395,7 @@ extern "C" jobjectArray org_jetbrains_skia_Path__1nConvertConicToQuads
 
 extern "C" jobject org_jetbrains_skia_Path__1nIsRect
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nIsRect");
+    TODO("implement org_jetbrains_skia_Path__1nIsRect");
 }
      
 #if 0 
@@ -437,27 +438,17 @@ extern "C" void org_jetbrains_skia_Path__1nAddArc
     instance->addArc({l, t, r, b}, startAngle, sweepAngle);
 }
 
-
-extern "C" void org_jetbrains_skia_Path__1nAddRRect
-  (kref __Kinstance, jlong ptr, jfloat l, jfloat t, jfloat r, jfloat b, jfloatArray radii, jint dirInt, jint start) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nAddRRect");
-}
-     
-#if 0 
 extern "C" void org_jetbrains_skia_Path__1nAddRRect
-  (kref __Kinstance, jlong ptr, jfloat l, jfloat t, jfloat r, jfloat b, jfloatArray radii, jint dirInt, jint start) {
+  (kref __Kinstance, jlong ptr, jfloat l, jfloat t, jfloat r, jfloat b, jfloatArray radii, jint radiiSize, jint dirInt, jint start) {
     SkPath* instance = reinterpret_cast<SkPath*>(static_cast<uintptr_t>(ptr));
-    SkRRect rrect = skija::RRect::toSkRRect(env, l, t, r, b, radii);
+    SkRRect rrect = skija::RRect::toSkRRect(l, t, r, b, radii, radiiSize);
     SkPathDirection dir = static_cast<SkPathDirection>(dirInt);
     instance->addRRect(rrect, dir, start);
 }
-#endif
-
-
 
 extern "C" void org_jetbrains_skia_Path__1nAddPoly
   (kref __Kinstance, jlong ptr, jfloatArray coords, jboolean close) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nAddPoly");
+    TODO("implement org_jetbrains_skia_Path__1nAddPoly");
 }
      
 #if 0 
@@ -491,7 +482,7 @@ extern "C" void org_jetbrains_skia_Path__1nAddPathOffset
 
 extern "C" void org_jetbrains_skia_Path__1nAddPathTransform
   (kref __Kinstance, jlong ptr, jlong srcPtr, jfloatArray matrixArr, jboolean extend) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nAddPathTransform");
+    TODO("implement org_jetbrains_skia_Path__1nAddPathTransform");
 }
      
 #if 0 
@@ -523,7 +514,7 @@ extern "C" void org_jetbrains_skia_Path__1nOffset
 
 extern "C" void org_jetbrains_skia_Path__1nTransform
   (kref __Kinstance, jlong ptr, jfloatArray matrixArr, jlong dstPtr, jboolean pcBool) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nTransform");
+    TODO("implement org_jetbrains_skia_Path__1nTransform");
 }
      
 #if 0 
@@ -541,7 +532,7 @@ extern "C" void org_jetbrains_skia_Path__1nTransform
 
 extern "C" jobject org_jetbrains_skia_Path__1nGetLastPt
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nGetLastPt");
+    TODO("implement org_jetbrains_skia_Path__1nGetLastPt");
 }
      
 #if 0 
@@ -590,7 +581,7 @@ extern "C" void org_jetbrains_skia_Path__1nDumpHex
 
 extern "C" jbyteArray org_jetbrains_skia_Path__1nSerializeToBytes
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nSerializeToBytes");
+    TODO("implement org_jetbrains_skia_Path__1nSerializeToBytes");
 }
      
 #if 0 
@@ -622,7 +613,7 @@ extern "C" jlong org_jetbrains_skia_Path__1nMakeCombining
 
 extern "C" jlong org_jetbrains_skia_Path__1nMakeFromBytes
   (kref __Kinstance, jbyteArray bytesArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Path__1nMakeFromBytes");
+    TODO("implement org_jetbrains_skia_Path__1nMakeFromBytes");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/PathEffect.cc

@@ -37,7 +37,7 @@ extern "C" jlong org_jetbrains_skia_PathEffect__1nMakePath1D
 
 extern "C" jlong org_jetbrains_skia_PathEffect__1nMakePath2D
   (kref __Kinstance, jfloatArray matrixArr, jlong pathPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_PathEffect__1nMakePath2D");
+    TODO("implement org_jetbrains_skia_PathEffect__1nMakePath2D");
 }
      
 #if 0 
@@ -54,7 +54,7 @@ extern "C" jlong org_jetbrains_skia_PathEffect__1nMakePath2D
 
 extern "C" jlong org_jetbrains_skia_PathEffect__1nMakeLine2D
   (kref __Kinstance, jfloat width, jfloatArray matrixArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_PathEffect__1nMakeLine2D");
+    TODO("implement org_jetbrains_skia_PathEffect__1nMakeLine2D");
 }
      
 #if 0 
@@ -76,7 +76,7 @@ extern "C" jlong org_jetbrains_skia_PathEffect__1nMakeCorner
 
 extern "C" jlong org_jetbrains_skia_PathEffect__1nMakeDash
   (kref __Kinstance, jfloatArray intervalsArray, jfloat phase) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_PathEffect__1nMakeDash");
+    TODO("implement org_jetbrains_skia_PathEffect__1nMakeDash");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/PathMeasure.cc

@@ -39,7 +39,7 @@ extern "C" jfloat org_jetbrains_skia_PathMeasure__1nGetLength
 
 extern "C" jobject org_jetbrains_skia_PathMeasure__1nGetPosition
   (kref __Kinstance, jlong ptr, jfloat distance) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_PathMeasure__1nGetPosition");
+    TODO("implement org_jetbrains_skia_PathMeasure__1nGetPosition");
 }
      
 #if 0 
@@ -58,7 +58,7 @@ extern "C" jobject org_jetbrains_skia_PathMeasure__1nGetPosition
 
 extern "C" jobject org_jetbrains_skia_PathMeasure__1nGetTangent
   (kref __Kinstance, jlong ptr, jfloat distance) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_PathMeasure__1nGetTangent");
+    TODO("implement org_jetbrains_skia_PathMeasure__1nGetTangent");
 }
      
 #if 0 
@@ -77,7 +77,7 @@ extern "C" jobject org_jetbrains_skia_PathMeasure__1nGetTangent
 
 extern "C" jobject org_jetbrains_skia_PathMeasure__1nGetRSXform
   (kref __Kinstance, jlong ptr, jfloat distance) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_PathMeasure__1nGetRSXform");
+    TODO("implement org_jetbrains_skia_PathMeasure__1nGetRSXform");
 }
      
 #if 0 
@@ -97,7 +97,7 @@ extern "C" jobject org_jetbrains_skia_PathMeasure__1nGetRSXform
 
 extern "C" jobject org_jetbrains_skia_PathMeasure__1nGetMatrix
   (kref __Kinstance, jlong ptr, jfloat distance, jboolean getPosition, jboolean getTangent) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_PathMeasure__1nGetMatrix");
+    TODO("implement org_jetbrains_skia_PathMeasure__1nGetMatrix");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/PathSegmentIterator.cc

@@ -24,7 +24,7 @@ extern "C" jlong org_jetbrains_skia_PathSegmentIterator__1nGetFinalizer
 
 extern "C" jobject org_jetbrains_skia_PathSegmentIterator__1nNext
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_PathSegmentIterator__1nNext");
+    TODO("implement org_jetbrains_skia_PathSegmentIterator__1nNext");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/Picture.cc

@@ -17,7 +17,7 @@ extern "C" jlong org_jetbrains_skia_Picture__1nMakeFromData
 
 extern "C" void org_jetbrains_skia_Picture__1nPlayback
   (kref __Kinstance, jlong ptr, jlong canvasPtr, jobject abort) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Picture__1nPlayback");
+    TODO("implement org_jetbrains_skia_Picture__1nPlayback");
 }
      
 #if 0 
@@ -38,7 +38,7 @@ extern "C" void org_jetbrains_skia_Picture__1nPlayback
 
 extern "C" jobject org_jetbrains_skia_Picture__1nGetCullRect
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Picture__1nGetCullRect");
+    TODO("implement org_jetbrains_skia_Picture__1nGetCullRect");
 }
      
 #if 0 
@@ -85,7 +85,7 @@ extern "C" jlong org_jetbrains_skia_Picture__1nGetApproximateBytesUsed
 
 extern "C" jlong org_jetbrains_skia_Picture__1nMakeShader
   (kref __Kinstance, jlong ptr, jint tmxValue, jint tmyValue, jint filterModeValue, jfloatArray localMatrixArr, jobject tileRectObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Picture__1nMakeShader");
+    TODO("implement org_jetbrains_skia_Picture__1nMakeShader");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/Pixmap.cc

@@ -68,7 +68,7 @@ extern "C" jboolean org_jetbrains_skia_Pixmap__1nExtractSubset
 
 extern "C" jobject org_jetbrains_skia_Pixmap__1nGetInfo
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Pixmap__1nGetInfo");
+    TODO("implement org_jetbrains_skia_Pixmap__1nGetInfo");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/Region.cc

@@ -42,7 +42,7 @@ extern "C" jboolean org_jetbrains_skia_Region__1nIsComplex(kref __Kinstance, jlo
 
 
 extern "C" jobject org_jetbrains_skia_Region__1nGetBounds(kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Region__1nGetBounds(kref");
+    TODO("implement org_jetbrains_skia_Region__1nGetBounds(kref");
 }
      
 #if 0 
@@ -76,7 +76,7 @@ extern "C" jboolean org_jetbrains_skia_Region__1nSetRect(kref __Kinstance, jlong
 
 
 extern "C" jboolean org_jetbrains_skia_Region__1nSetRects(kref __Kinstance, jlong ptr, jintArray coords) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Region__1nSetRects(kref");
+    TODO("implement org_jetbrains_skia_Region__1nSetRects(kref");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/RuntimeEffect.cc

@@ -7,7 +7,7 @@
 
 extern "C" jlong org_jetbrains_skia_RuntimeEffect__1nMakeShader
     (kref __Kinstance, jlong ptr, jlong uniformPtr, jlongArray childrenPtrsArr, jfloatArray localMatrixArr, jboolean isOpaque) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_RuntimeEffect__1nMakeShader");
+    TODO("implement org_jetbrains_skia_RuntimeEffect__1nMakeShader");
 }
      
 #if 0 
@@ -39,7 +39,7 @@ extern "C" jlong org_jetbrains_skia_RuntimeEffect__1nMakeShader
 
 extern "C" jlong org_jetbrains_skia_RuntimeEffect__1nMakeForShader
     (kref __Kinstance, jstring sksl) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_RuntimeEffect__1nMakeForShader");
+    TODO("implement org_jetbrains_skia_RuntimeEffect__1nMakeForShader");
 }
      
 #if 0 
@@ -61,7 +61,7 @@ extern "C" jlong org_jetbrains_skia_RuntimeEffect__1nMakeForShader
 
 extern "C" jlong org_jetbrains_skia_RuntimeEffect__1nMakeForColorFilter
     (kref __Kinstance, jstring sksl) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_RuntimeEffect__1nMakeForColorFilter");
+    TODO("implement org_jetbrains_skia_RuntimeEffect__1nMakeForColorFilter");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/Shader.cc

@@ -18,7 +18,7 @@ extern "C" jlong org_jetbrains_skia_Shader__1nMakeWithColorFilter
 
 extern "C" jlong org_jetbrains_skia_Shader__1nMakeLinearGradient
   (kref __Kinstance, jfloat x0, jfloat y0, jfloat x1, jfloat y1, jintArray colorsArray, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Shader__1nMakeLinearGradient");
+    TODO("implement org_jetbrains_skia_Shader__1nMakeLinearGradient");
 }
      
 #if 0 
@@ -41,7 +41,7 @@ extern "C" jlong org_jetbrains_skia_Shader__1nMakeLinearGradient
 
 extern "C" jlong org_jetbrains_skia_Shader__1nMakeLinearGradientCS
   (kref __Kinstance, jfloat x0, jfloat y0, jfloat x1, jfloat y1, jfloatArray colorsArray, jlong colorSpacePtr, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Shader__1nMakeLinearGradientCS");
+    TODO("implement org_jetbrains_skia_Shader__1nMakeLinearGradientCS");
 }
      
 #if 0 
@@ -64,7 +64,7 @@ extern "C" jlong org_jetbrains_skia_Shader__1nMakeLinearGradientCS
 
 extern "C" jlong org_jetbrains_skia_Shader__1nMakeRadialGradient
   (kref __Kinstance, jfloat x, jfloat y, jfloat r, jintArray colorsArray, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Shader__1nMakeRadialGradient");
+    TODO("implement org_jetbrains_skia_Shader__1nMakeRadialGradient");
 }
      
 #if 0 
@@ -86,7 +86,7 @@ extern "C" jlong org_jetbrains_skia_Shader__1nMakeRadialGradient
 
 extern "C" jlong org_jetbrains_skia_Shader__1nMakeRadialGradientCS
   (kref __Kinstance, jfloat x, jfloat y, jfloat r, jfloatArray colorsArray, jlong colorSpacePtr, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Shader__1nMakeRadialGradientCS");
+    TODO("implement org_jetbrains_skia_Shader__1nMakeRadialGradientCS");
 }
      
 #if 0 
@@ -108,7 +108,7 @@ extern "C" jlong org_jetbrains_skia_Shader__1nMakeRadialGradientCS
 
 extern "C" jlong org_jetbrains_skia_Shader__1nMakeTwoPointConicalGradient
   (kref __Kinstance, jfloat x0, jfloat y0, jfloat r0, jfloat x1, jfloat y1, jfloat r1, jintArray colorsArray, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Shader__1nMakeTwoPointConicalGradient");
+    TODO("implement org_jetbrains_skia_Shader__1nMakeTwoPointConicalGradient");
 }
      
 #if 0 
@@ -130,7 +130,7 @@ extern "C" jlong org_jetbrains_skia_Shader__1nMakeTwoPointConicalGradient
 
 extern "C" jlong org_jetbrains_skia_Shader__1nMakeTwoPointConicalGradientCS
   (kref __Kinstance, jfloat x0, jfloat y0, jfloat r0, jfloat x1, jfloat y1, jfloat r1, jfloatArray colorsArray, jlong colorSpacePtr, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Shader__1nMakeTwoPointConicalGradientCS");
+    TODO("implement org_jetbrains_skia_Shader__1nMakeTwoPointConicalGradientCS");
 }
      
 #if 0 
@@ -152,7 +152,7 @@ extern "C" jlong org_jetbrains_skia_Shader__1nMakeTwoPointConicalGradientCS
 
 extern "C" jlong org_jetbrains_skia_Shader__1nMakeSweepGradient
   (kref __Kinstance, jfloat x, jfloat y, jfloat start, jfloat end, jintArray colorsArray, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Shader__1nMakeSweepGradient");
+    TODO("implement org_jetbrains_skia_Shader__1nMakeSweepGradient");
 }
      
 #if 0 
@@ -174,7 +174,7 @@ extern "C" jlong org_jetbrains_skia_Shader__1nMakeSweepGradient
 
 extern "C" jlong org_jetbrains_skia_Shader__1nMakeSweepGradientCS
   (kref __Kinstance, jfloat x, jfloat y, jfloat start, jfloat end, jfloatArray colorsArray, jlong colorSpacePtr, jfloatArray posArray, jint tileModeInt, jint flags, jfloatArray matrixArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Shader__1nMakeSweepGradientCS");
+    TODO("implement org_jetbrains_skia_Shader__1nMakeSweepGradientCS");
 }
      
 #if 0 
@@ -219,7 +219,7 @@ extern "C" jlong org_jetbrains_skia_Shader__1nMakeBlend(kref __Kinstance, jint b
 
 extern "C" jlong org_jetbrains_skia_Shader__1nMakeFractalNoise
   (jfloat baseFrequencyX, jfloat baseFrequencyY, jint numOctaves, jfloat seed, jintArray tilesArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Shader__1nMakeFractalNoise");
+    TODO("implement org_jetbrains_skia_Shader__1nMakeFractalNoise");
 }
 #if 0
 extern "C" jlong org_jetbrains_skia_Shader__1nMakeFractalNoise
@@ -237,7 +237,7 @@ extern "C" jlong org_jetbrains_skia_Shader__1nMakeFractalNoise
 
 extern "C" jlong org_jetbrains_skia_Shader__1nMakeTurbulence
   (jfloat baseFrequencyX, jfloat baseFrequencyY, jint numOctaves, jfloat seed, jintArray tilesArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Shader__1nMakeTurbulence");
+    TODO("implement org_jetbrains_skia_Shader__1nMakeTurbulence");
 }
 #if 0
 extern "C" jlong org_jetbrains_skia_Shader__1nMakeTurbulence

skiko/src/macosX64Main/cpp/generated/Surface.cc

@@ -13,7 +13,7 @@ extern "C" jlong org_jetbrains_skia_Surface__1nMakeRasterDirect
     jlong pixelsPtr, jlong rowBytes,
     jobject surfacePropsObj)
 {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Surface__1nMakeRasterDirect");
+    TODO("implement org_jetbrains_skia_Surface__1nMakeRasterDirect");
 }
      
 #if 0 
@@ -46,7 +46,7 @@ extern "C" jlong org_jetbrains_skia_Surface__1nMakeRasterDirectWithPixmap
   (kref __Kinstance,
     jlong pixmapPtr, jobject surfacePropsObj)
 {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Surface__1nMakeRasterDirectWithPixmap");
+    TODO("implement org_jetbrains_skia_Surface__1nMakeRasterDirectWithPixmap");
 }
      
 #if 0 
@@ -70,7 +70,7 @@ extern "C" jlong org_jetbrains_skia_Surface__1nMakeRaster
     jlong rowBytes,
     jobject surfacePropsObj)
 {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Surface__1nMakeRaster");
+    TODO("implement org_jetbrains_skia_Surface__1nMakeRaster");
 }
      
 #if 0 
@@ -136,7 +136,7 @@ extern "C" jlong org_jetbrains_skia_Surface__1nMakeFromBackendRenderTarget
 
 extern "C" jlong org_jetbrains_skia_Surface__1nMakeFromMTKView
   (kref __Kinstance, jlong contextPtr, jlong mtkViewPtr, jint surfaceOrigin, jint sampleCount, jint colorType, jlong colorSpacePtr, jobject surfacePropsObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Surface__1nMakeFromMTKView");
+    TODO("implement org_jetbrains_skia_Surface__1nMakeFromMTKView");
 }
      
 #if 0 
@@ -170,7 +170,7 @@ extern "C" jlong org_jetbrains_skia_Surface__1nMakeRenderTarget
     jobject surfacePropsObj,
     jboolean shouldCreateWithMips)
 {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Surface__1nMakeRenderTarget");
+    TODO("implement org_jetbrains_skia_Surface__1nMakeRenderTarget");
 }
      
 #if 0 
@@ -292,7 +292,7 @@ extern "C" jboolean org_jetbrains_skia_Surface__1nUnique
 
 extern "C" jobject org_jetbrains_skia_Surface__1nGetImageInfo
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Surface__1nGetImageInfo");
+    TODO("implement org_jetbrains_skia_Surface__1nGetImageInfo");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/TextBlob.cc

@@ -20,7 +20,7 @@ extern "C" jlong org_jetbrains_skia_TextBlob__1nGetFinalizer
 
 extern "C" jobject org_jetbrains_skia_TextBlob__1nBounds
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlob__1nBounds");
+    TODO("implement org_jetbrains_skia_TextBlob__1nBounds");
 }
      
 #if 0 
@@ -42,7 +42,7 @@ extern "C" jint org_jetbrains_skia_TextBlob__1nGetUniqueId
 
 extern "C" jfloatArray org_jetbrains_skia_TextBlob__1nGetIntercepts
   (kref __Kinstance, jlong ptr, jfloat lower, jfloat upper, jlong paintPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlob__1nGetIntercepts");
+    TODO("implement org_jetbrains_skia_TextBlob__1nGetIntercepts");
 }
      
 #if 0 
@@ -62,7 +62,7 @@ extern "C" jfloatArray org_jetbrains_skia_TextBlob__1nGetIntercepts
 
 extern "C" jlong org_jetbrains_skia_TextBlob__1nMakeFromPosH
   (kref __Kinstance, jshortArray glyphsArr, jfloatArray xposArr, jfloat ypos, jlong fontPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlob__1nMakeFromPosH");
+    TODO("implement org_jetbrains_skia_TextBlob__1nMakeFromPosH");
 }
      
 #if 0 
@@ -86,7 +86,7 @@ extern "C" jlong org_jetbrains_skia_TextBlob__1nMakeFromPosH
 
 extern "C" jlong org_jetbrains_skia_TextBlob__1nMakeFromPos
   (kref __Kinstance, jshortArray glyphsArr, jfloatArray posArr, jlong fontPtr ) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlob__1nMakeFromPos");
+    TODO("implement org_jetbrains_skia_TextBlob__1nMakeFromPos");
 }
      
 #if 0 
@@ -110,7 +110,7 @@ extern "C" jlong org_jetbrains_skia_TextBlob__1nMakeFromPos
 
 extern "C" jlong org_jetbrains_skia_TextBlob__1nMakeFromRSXform
   (kref __Kinstance, jshortArray glyphsArr, jfloatArray xformArr, jlong fontPtr ) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlob__1nMakeFromRSXform");
+    TODO("implement org_jetbrains_skia_TextBlob__1nMakeFromRSXform");
 }
      
 #if 0 
@@ -148,7 +148,7 @@ extern "C" jlong org_jetbrains_skia_TextBlob__1nMakeFromData
 
 extern "C" jshortArray org_jetbrains_skia_TextBlob__1nGetGlyphs
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlob__1nGetGlyphs");
+    TODO("implement org_jetbrains_skia_TextBlob__1nGetGlyphs");
 }
      
 #if 0 
@@ -172,7 +172,7 @@ extern "C" jshortArray org_jetbrains_skia_TextBlob__1nGetGlyphs
 
 extern "C" jfloatArray org_jetbrains_skia_TextBlob__1nGetPositions
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlob__1nGetPositions");
+    TODO("implement org_jetbrains_skia_TextBlob__1nGetPositions");
 }
      
 #if 0 
@@ -199,7 +199,7 @@ extern "C" jfloatArray org_jetbrains_skia_TextBlob__1nGetPositions
 
 extern "C" jintArray org_jetbrains_skia_TextBlob__1nGetClusters
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlob__1nGetClusters");
+    TODO("implement org_jetbrains_skia_TextBlob__1nGetClusters");
 }
      
 #if 0 
@@ -236,7 +236,7 @@ extern "C" jintArray org_jetbrains_skia_TextBlob__1nGetClusters
 
 extern "C" jobject org_jetbrains_skia_TextBlob__1nGetTightBounds
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlob__1nGetTightBounds");
+    TODO("implement org_jetbrains_skia_TextBlob__1nGetTightBounds");
 }
      
 #if 0 
@@ -266,7 +266,7 @@ extern "C" jobject org_jetbrains_skia_TextBlob__1nGetTightBounds
 
 extern "C" jobject org_jetbrains_skia_TextBlob__1nGetBlockBounds
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlob__1nGetBlockBounds");
+    TODO("implement org_jetbrains_skia_TextBlob__1nGetBlockBounds");
 }
      
 #if 0 
@@ -306,7 +306,7 @@ extern "C" jobject org_jetbrains_skia_TextBlob__1nGetBlockBounds
 
 extern "C" jobject org_jetbrains_skia_TextBlob__1nGetFirstBaseline
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlob__1nGetFirstBaseline");
+    TODO("implement org_jetbrains_skia_TextBlob__1nGetFirstBaseline");
 }
      
 #if 0 
@@ -331,7 +331,7 @@ extern "C" jobject org_jetbrains_skia_TextBlob__1nGetFirstBaseline
 
 extern "C" jobject org_jetbrains_skia_TextBlob__1nGetLastBaseline
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlob__1nGetLastBaseline");
+    TODO("implement org_jetbrains_skia_TextBlob__1nGetLastBaseline");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/TextBlobBuilder.cc

@@ -28,7 +28,7 @@ extern "C" jlong org_jetbrains_skia_TextBlobBuilder__1nBuild
 
 extern "C" void org_jetbrains_skia_TextBlobBuilder__1nAppendRun
   (kref __Kinstance, jlong ptr, jlong fontPtr, jshortArray glyphsArr, jfloat x, jfloat y, jobject boundsObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlobBuilder__1nAppendRun");
+    TODO("implement org_jetbrains_skia_TextBlobBuilder__1nAppendRun");
 }
      
 #if 0 
@@ -47,7 +47,7 @@ extern "C" void org_jetbrains_skia_TextBlobBuilder__1nAppendRun
 
 extern "C" void org_jetbrains_skia_TextBlobBuilder__1nAppendRunPosH
   (kref __Kinstance, jlong ptr, jlong fontPtr, jshortArray glyphsArr, jfloatArray xsArr, jfloat y, jobject boundsObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlobBuilder__1nAppendRunPosH");
+    TODO("implement org_jetbrains_skia_TextBlobBuilder__1nAppendRunPosH");
 }
      
 #if 0 
@@ -67,7 +67,7 @@ extern "C" void org_jetbrains_skia_TextBlobBuilder__1nAppendRunPosH
 
 extern "C" void org_jetbrains_skia_TextBlobBuilder__1nAppendRunPos
   (kref __Kinstance, jlong ptr, jlong fontPtr, jshortArray glyphsArr, jfloatArray posArr, jobject boundsObj) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlobBuilder__1nAppendRunPos");
+    TODO("implement org_jetbrains_skia_TextBlobBuilder__1nAppendRunPos");
 }
      
 #if 0 
@@ -87,7 +87,7 @@ extern "C" void org_jetbrains_skia_TextBlobBuilder__1nAppendRunPos
 
 extern "C" void org_jetbrains_skia_TextBlobBuilder__1nAppendRunRSXform
   (kref __Kinstance, jlong ptr, jlong fontPtr, jshortArray glyphsArr, jfloatArray xformArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextBlobBuilder__1nAppendRunRSXform");
+    TODO("implement org_jetbrains_skia_TextBlobBuilder__1nAppendRunRSXform");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/TextLine.cc

@@ -9,7 +9,7 @@
 
 extern "C" jlong org_jetbrains_skia_TextLine__1nGetFinalizer
   (kref __Kinstance) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetFinalizer");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetFinalizer");
 }
      
 #if 0 
@@ -23,7 +23,7 @@ extern "C" jlong org_jetbrains_skia_TextLine__1nGetFinalizer
 
 extern "C" jfloat org_jetbrains_skia_TextLine__1nGetAscent
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetAscent");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetAscent");
 }
      
 #if 0 
@@ -38,7 +38,7 @@ extern "C" jfloat org_jetbrains_skia_TextLine__1nGetAscent
 
 extern "C" jfloat org_jetbrains_skia_TextLine__1nGetCapHeight
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetCapHeight");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetCapHeight");
 }
      
 #if 0 
@@ -53,7 +53,7 @@ extern "C" jfloat org_jetbrains_skia_TextLine__1nGetCapHeight
 
 extern "C" jfloat org_jetbrains_skia_TextLine__1nGetXHeight
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetXHeight");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetXHeight");
 }
      
 #if 0 
@@ -68,7 +68,7 @@ extern "C" jfloat org_jetbrains_skia_TextLine__1nGetXHeight
 
 extern "C" jfloat org_jetbrains_skia_TextLine__1nGetDescent
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetDescent");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetDescent");
 }
      
 #if 0 
@@ -83,7 +83,7 @@ extern "C" jfloat org_jetbrains_skia_TextLine__1nGetDescent
 
 extern "C" jfloat org_jetbrains_skia_TextLine__1nGetLeading
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetLeading");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetLeading");
 }
      
 #if 0 
@@ -98,7 +98,7 @@ extern "C" jfloat org_jetbrains_skia_TextLine__1nGetLeading
 
 extern "C" jfloat org_jetbrains_skia_TextLine__1nGetWidth
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetWidth");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetWidth");
 }
      
 #if 0 
@@ -113,7 +113,7 @@ extern "C" jfloat org_jetbrains_skia_TextLine__1nGetWidth
 
 extern "C" jfloat org_jetbrains_skia_TextLine__1nGetHeight
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetHeight");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetHeight");
 }
      
 #if 0 
@@ -128,7 +128,7 @@ extern "C" jfloat org_jetbrains_skia_TextLine__1nGetHeight
 
 extern "C" jlong org_jetbrains_skia_TextLine__1nGetTextBlob
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetTextBlob");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetTextBlob");
 }
      
 #if 0 
@@ -146,7 +146,7 @@ extern "C" jlong org_jetbrains_skia_TextLine__1nGetTextBlob
 
 extern "C" jshortArray org_jetbrains_skia_TextLine__1nGetGlyphs
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetGlyphs");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetGlyphs");
 }
      
 #if 0 
@@ -168,7 +168,7 @@ extern "C" jshortArray org_jetbrains_skia_TextLine__1nGetGlyphs
 
 extern "C" jfloatArray org_jetbrains_skia_TextLine__1nGetPositions
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetPositions");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetPositions");
 }
      
 #if 0 
@@ -190,7 +190,7 @@ extern "C" jfloatArray org_jetbrains_skia_TextLine__1nGetPositions
 
 extern "C" jfloatArray org_jetbrains_skia_TextLine__1nGetRunPositions
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetRunPositions");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetRunPositions");
 }
      
 #if 0 
@@ -208,7 +208,7 @@ extern "C" jfloatArray org_jetbrains_skia_TextLine__1nGetRunPositions
 
 extern "C" jfloatArray org_jetbrains_skia_TextLine__1nGetBreakPositions
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetBreakPositions");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetBreakPositions");
 }
      
 #if 0 
@@ -226,7 +226,7 @@ extern "C" jfloatArray org_jetbrains_skia_TextLine__1nGetBreakPositions
 
 extern "C" jintArray org_jetbrains_skia_TextLine__1nGetBreakOffsets
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetBreakOffsets");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetBreakOffsets");
 }
      
 #if 0 
@@ -244,7 +244,7 @@ extern "C" jintArray org_jetbrains_skia_TextLine__1nGetBreakOffsets
 
 extern "C" jint org_jetbrains_skia_TextLine__1nGetOffsetAtCoord
   (kref __Kinstance, jlong ptr, jfloat x) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetOffsetAtCoord");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetOffsetAtCoord");
 }
      
 #if 0 
@@ -273,7 +273,7 @@ extern "C" jint org_jetbrains_skia_TextLine__1nGetOffsetAtCoord
 
 extern "C" jint org_jetbrains_skia_TextLine__1nGetLeftOffsetAtCoord
   (kref __Kinstance, jlong ptr, jfloat x) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetLeftOffsetAtCoord");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetLeftOffsetAtCoord");
 }
      
 #if 0 
@@ -300,7 +300,7 @@ extern "C" jint org_jetbrains_skia_TextLine__1nGetLeftOffsetAtCoord
 
 extern "C" jfloat org_jetbrains_skia_TextLine__1nGetCoordAtOffset
   (kref __Kinstance, jlong ptr, jint offset16) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_TextLine__1nGetCoordAtOffset");
+    TODO("implement org_jetbrains_skia_TextLine__1nGetCoordAtOffset");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/Typeface.cc

@@ -9,7 +9,7 @@
 
 extern "C" jint org_jetbrains_skia_Typeface__1nGetFontStyle
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Typeface__1nGetFontStyle");
+    TODO("implement org_jetbrains_skia_Typeface__1nGetFontStyle");
 }
      
 #if 0 
@@ -30,7 +30,7 @@ extern "C" jboolean org_jetbrains_skia_Typeface__1nIsFixedPitch
 
 extern "C" jobjectArray org_jetbrains_skia_Typeface__1nGetVariations
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Typeface__1nGetVariations");
+    TODO("implement org_jetbrains_skia_Typeface__1nGetVariations");
 }
      
 #if 0 
@@ -56,7 +56,7 @@ extern "C" jobjectArray org_jetbrains_skia_Typeface__1nGetVariations
 
 extern "C" jobjectArray org_jetbrains_skia_Typeface__1nGetVariationAxes
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Typeface__1nGetVariationAxes");
+    TODO("implement org_jetbrains_skia_Typeface__1nGetVariationAxes");
 }
      
 #if 0 
@@ -121,7 +121,7 @@ sk_sp<SkTypeface> setDefaultVariationCoords(sk_sp<SkTypeface> face) {
 
 extern "C" jlong org_jetbrains_skia_Typeface__1nMakeFromName
   (kref __Kinstance, jstring nameStr, jint styleValue) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Typeface__1nMakeFromName");
+    TODO("implement org_jetbrains_skia_Typeface__1nMakeFromName");
 }
      
 #if 0 
@@ -139,7 +139,7 @@ extern "C" jlong org_jetbrains_skia_Typeface__1nMakeFromName
 
 extern "C" jlong org_jetbrains_skia_Typeface__1nMakeFromFile
   (kref __Kinstance, jstring pathStr, jint index) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Typeface__1nMakeFromFile");
+    TODO("implement org_jetbrains_skia_Typeface__1nMakeFromFile");
 }
      
 #if 0 
@@ -164,7 +164,7 @@ extern "C" jlong org_jetbrains_skia_Typeface__1nMakeFromData
 
 extern "C" jlong org_jetbrains_skia_Typeface__1nMakeClone
   (kref __Kinstance, jlong typefacePtr, jobjectArray variations, jint collectionIndex) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Typeface__1nMakeClone");
+    TODO("implement org_jetbrains_skia_Typeface__1nMakeClone");
 }
      
 #if 0 
@@ -193,7 +193,7 @@ extern "C" jlong org_jetbrains_skia_Typeface__1nMakeClone
 
 extern "C" jshortArray org_jetbrains_skia_Typeface__1nGetUTF32Glyphs
   (kref __Kinstance, jlong ptr, jintArray uniArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Typeface__1nGetUTF32Glyphs");
+    TODO("implement org_jetbrains_skia_Typeface__1nGetUTF32Glyphs");
 }
      
 #if 0 
@@ -231,7 +231,7 @@ extern "C" jint org_jetbrains_skia_Typeface__1nGetTablesCount
 
 extern "C" jintArray org_jetbrains_skia_Typeface__1nGetTableTags
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Typeface__1nGetTableTags");
+    TODO("implement org_jetbrains_skia_Typeface__1nGetTableTags");
 }
      
 #if 0 
@@ -268,7 +268,7 @@ extern "C" jint org_jetbrains_skia_Typeface__1nGetUnitsPerEm
 
 extern "C" jintArray org_jetbrains_skia_Typeface__1nGetKerningPairAdjustments
   (kref __Kinstance, jlong ptr, jshortArray glyphsArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Typeface__1nGetKerningPairAdjustments");
+    TODO("implement org_jetbrains_skia_Typeface__1nGetKerningPairAdjustments");
 }
      
 #if 0 
@@ -295,7 +295,7 @@ extern "C" jintArray org_jetbrains_skia_Typeface__1nGetKerningPairAdjustments
 
 extern "C" jobjectArray org_jetbrains_skia_Typeface__1nGetFamilyNames
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Typeface__1nGetFamilyNames");
+    TODO("implement org_jetbrains_skia_Typeface__1nGetFamilyNames");
 }
      
 #if 0 
@@ -324,7 +324,7 @@ extern "C" jobjectArray org_jetbrains_skia_Typeface__1nGetFamilyNames
 
 extern "C" jstring org_jetbrains_skia_Typeface__1nGetFamilyName
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Typeface__1nGetFamilyName");
+    TODO("implement org_jetbrains_skia_Typeface__1nGetFamilyName");
 }
      
 #if 0 
@@ -341,7 +341,7 @@ extern "C" jstring org_jetbrains_skia_Typeface__1nGetFamilyName
 
 extern "C" jobject org_jetbrains_skia_Typeface__1nGetBounds
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_Typeface__1nGetBounds");
+    TODO("implement org_jetbrains_skia_Typeface__1nGetBounds");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/U16String.cc

@@ -17,7 +17,7 @@ extern "C" jlong org_jetbrains_skia_U16String__1nGetFinalizer
 
 extern "C" jlong org_jetbrains_skia_U16String__1nMake
   (kref __Kinstance, jstring str) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_U16String__1nMake");
+    TODO("implement org_jetbrains_skia_U16String__1nMake");
 }
      
 #if 0 
@@ -34,7 +34,7 @@ extern "C" jlong org_jetbrains_skia_U16String__1nMake
 
 extern "C" jobject org_jetbrains_skia_U16String__1nToString
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_U16String__1nToString");
+    TODO("implement org_jetbrains_skia_U16String__1nToString");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/paragraph/FontCollection.cc

@@ -23,7 +23,7 @@ extern "C" jlong org_jetbrains_skia_paragraph_FontCollection__1nGetFontManagersC
 
 extern "C" void org_jetbrains_skia_paragraph_FontCollection__1nSetAssetFontManager
   (kref __Kinstance, jlong ptr, jlong fontManagerPtr, jstring defaultFamilyNameStr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_FontCollection__1nSetAssetFontManager");
+    TODO("implement org_jetbrains_skia_paragraph_FontCollection__1nSetAssetFontManager");
 }
      
 #if 0 
@@ -39,7 +39,7 @@ extern "C" void org_jetbrains_skia_paragraph_FontCollection__1nSetAssetFontManag
 
 extern "C" void org_jetbrains_skia_paragraph_FontCollection__1nSetDynamicFontManager
   (kref __Kinstance, jlong ptr, jlong fontManagerPtr, jstring defaultFamilyNameStr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_FontCollection__1nSetDynamicFontManager");
+    TODO("implement org_jetbrains_skia_paragraph_FontCollection__1nSetDynamicFontManager");
 }
      
 #if 0 
@@ -55,7 +55,7 @@ extern "C" void org_jetbrains_skia_paragraph_FontCollection__1nSetDynamicFontMan
 
 extern "C" void org_jetbrains_skia_paragraph_FontCollection__1nSetTestFontManager
   (kref __Kinstance, jlong ptr, jlong fontManagerPtr, jstring defaultFamilyNameStr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_FontCollection__1nSetTestFontManager");
+    TODO("implement org_jetbrains_skia_paragraph_FontCollection__1nSetTestFontManager");
 }
      
 #if 0 
@@ -71,7 +71,7 @@ extern "C" void org_jetbrains_skia_paragraph_FontCollection__1nSetTestFontManage
 
 extern "C" void org_jetbrains_skia_paragraph_FontCollection__1nSetDefaultFontManager
   (kref __Kinstance, jlong ptr, jlong fontManagerPtr, jstring defaultFamilyNameStr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_FontCollection__1nSetDefaultFontManager");
+    TODO("implement org_jetbrains_skia_paragraph_FontCollection__1nSetDefaultFontManager");
 }
      
 #if 0 
@@ -99,7 +99,7 @@ extern "C" jlong org_jetbrains_skia_paragraph_FontCollection__1nGetFallbackManag
 
 extern "C" jlongArray org_jetbrains_skia_paragraph_FontCollection__1nFindTypefaces
   (kref __Kinstance, jlong ptr, jobjectArray familyNamesArray, jint fontStyle) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_FontCollection__1nFindTypefaces");
+    TODO("implement org_jetbrains_skia_paragraph_FontCollection__1nFindTypefaces");
 }
      
 #if 0 
@@ -130,7 +130,7 @@ extern "C" jlongArray org_jetbrains_skia_paragraph_FontCollection__1nFindTypefac
 
 extern "C" jlong org_jetbrains_skia_paragraph_FontCollection__1nDefaultFallbackChar
   (kref __Kinstance, jlong ptr, jint unicode, jint fontStyle, jstring locale) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_FontCollection__1nDefaultFallbackChar");
+    TODO("implement org_jetbrains_skia_paragraph_FontCollection__1nDefaultFallbackChar");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/paragraph/Paragraph.cc

@@ -81,7 +81,7 @@ extern "C" void org_jetbrains_skia_paragraph_Paragraph__1nPaint
 
 extern "C" jobjectArray org_jetbrains_skia_paragraph_Paragraph__1nGetRectsForRange
   (kref __Kinstance, jlong ptr, jint start, jint end, jint rectHeightStyle, jint rectWidthStyle) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_Paragraph__1nGetRectsForRange");
+    TODO("implement org_jetbrains_skia_paragraph_Paragraph__1nGetRectsForRange");
 }
      
 #if 0 
@@ -104,7 +104,7 @@ extern "C" jobjectArray org_jetbrains_skia_paragraph_Paragraph__1nGetRectsForRan
 
 extern "C" jobjectArray org_jetbrains_skia_paragraph_Paragraph__1nGetRectsForPlaceholders
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_Paragraph__1nGetRectsForPlaceholders");
+    TODO("implement org_jetbrains_skia_paragraph_Paragraph__1nGetRectsForPlaceholders");
 }
      
 #if 0 
@@ -144,7 +144,7 @@ extern "C" jlong org_jetbrains_skia_paragraph_Paragraph__1nGetWordBoundary
 
 extern "C" jobjectArray org_jetbrains_skia_paragraph_Paragraph__1nGetLineMetrics
   (kref __Kinstance, jlong ptr, jlong textPtr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_Paragraph__1nGetLineMetrics");
+    TODO("implement org_jetbrains_skia_paragraph_Paragraph__1nGetLineMetrics");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/paragraph/ParagraphBuilder.cc

@@ -41,7 +41,7 @@ extern "C" void org_jetbrains_skia_paragraph_ParagraphBuilder__1nPopStyle
 
 extern "C" void org_jetbrains_skia_paragraph_ParagraphBuilder__1nAddText
   (kref __Kinstance, jlong ptr, jstring textString) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_ParagraphBuilder__1nAddText");
+    TODO("implement org_jetbrains_skia_paragraph_ParagraphBuilder__1nAddText");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/paragraph/ParagraphStyle.cc

@@ -98,7 +98,7 @@ extern "C" void org_jetbrains_skia_paragraph_ParagraphStyle__1nSetMaxLinesCount
 
 extern "C" jstring org_jetbrains_skia_paragraph_ParagraphStyle__1nGetEllipsis
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_ParagraphStyle__1nGetEllipsis");
+    TODO("implement org_jetbrains_skia_paragraph_ParagraphStyle__1nGetEllipsis");
 }
      
 #if 0 
@@ -113,7 +113,7 @@ extern "C" jstring org_jetbrains_skia_paragraph_ParagraphStyle__1nGetEllipsis
 
 extern "C" void org_jetbrains_skia_paragraph_ParagraphStyle__1nSetEllipsis
   (kref __Kinstance, jlong ptr, jstring ellipsis) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_ParagraphStyle__1nSetEllipsis");
+    TODO("implement org_jetbrains_skia_paragraph_ParagraphStyle__1nSetEllipsis");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/paragraph/StrutStyle.cc

@@ -33,7 +33,7 @@ extern "C" jboolean org_jetbrains_skia_paragraph_StrutStyle__1nEquals
 
 extern "C" jobjectArray org_jetbrains_skia_paragraph_StrutStyle__1nGetFontFamilies
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_StrutStyle__1nGetFontFamilies");
+    TODO("implement org_jetbrains_skia_paragraph_StrutStyle__1nGetFontFamilies");
 }
      
 #if 0 
@@ -48,7 +48,7 @@ extern "C" jobjectArray org_jetbrains_skia_paragraph_StrutStyle__1nGetFontFamili
 
 extern "C" void org_jetbrains_skia_paragraph_StrutStyle__1nSetFontFamilies
   (kref __Kinstance, jlong ptr, jobjectArray familiesArr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_StrutStyle__1nSetFontFamilies");
+    TODO("implement org_jetbrains_skia_paragraph_StrutStyle__1nSetFontFamilies");
 }
      
 #if 0 
@@ -63,7 +63,7 @@ extern "C" void org_jetbrains_skia_paragraph_StrutStyle__1nSetFontFamilies
 
 extern "C" jint org_jetbrains_skia_paragraph_StrutStyle__1nGetFontStyle
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_StrutStyle__1nGetFontStyle");
+    TODO("implement org_jetbrains_skia_paragraph_StrutStyle__1nGetFontStyle");
 }
      
 #if 0 
@@ -78,7 +78,7 @@ extern "C" jint org_jetbrains_skia_paragraph_StrutStyle__1nGetFontStyle
 
 extern "C" void org_jetbrains_skia_paragraph_StrutStyle__1nSetFontStyle
   (kref __Kinstance, jlong ptr, jint style) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_StrutStyle__1nSetFontStyle");
+    TODO("implement org_jetbrains_skia_paragraph_StrutStyle__1nSetFontStyle");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/paragraph/TextStyle.cc

@@ -89,7 +89,7 @@ extern "C" void org_jetbrains_skia_paragraph_TextStyle__1nSetBackground
 
 extern "C" jobject org_jetbrains_skia_paragraph_TextStyle__1nGetDecorationStyle
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_TextStyle__1nGetDecorationStyle");
+    TODO("implement org_jetbrains_skia_paragraph_TextStyle__1nGetDecorationStyle");
 }
      
 #if 0 
@@ -126,7 +126,7 @@ extern "C" void org_jetbrains_skia_paragraph_TextStyle__1nSetDecorationStyle
 
 extern "C" jint org_jetbrains_skia_paragraph_TextStyle__1nGetFontStyle
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_TextStyle__1nGetFontStyle");
+    TODO("implement org_jetbrains_skia_paragraph_TextStyle__1nGetFontStyle");
 }
      
 #if 0 
@@ -141,7 +141,7 @@ extern "C" jint org_jetbrains_skia_paragraph_TextStyle__1nGetFontStyle
 
 extern "C" void org_jetbrains_skia_paragraph_TextStyle__1nSetFontStyle
   (kref __Kinstance, jlong ptr, jint fontStyleValue) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_TextStyle__1nSetFontStyle");
+    TODO("implement org_jetbrains_skia_paragraph_TextStyle__1nSetFontStyle");
 }
      
 #if 0 
@@ -156,7 +156,7 @@ extern "C" void org_jetbrains_skia_paragraph_TextStyle__1nSetFontStyle
 
 extern "C" jobjectArray org_jetbrains_skia_paragraph_TextStyle__1nGetShadows
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_TextStyle__1nGetShadows");
+    TODO("implement org_jetbrains_skia_paragraph_TextStyle__1nGetShadows");
 }
      
 #if 0 
@@ -190,7 +190,7 @@ extern "C" void org_jetbrains_skia_paragraph_TextStyle__1nClearShadows
 
 extern "C" jobjectArray org_jetbrains_skia_paragraph_TextStyle__1nGetFontFeatures
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_TextStyle__1nGetFontFeatures");
+    TODO("implement org_jetbrains_skia_paragraph_TextStyle__1nGetFontFeatures");
 }
      
 #if 0 
@@ -213,7 +213,7 @@ extern "C" jobjectArray org_jetbrains_skia_paragraph_TextStyle__1nGetFontFeature
 
 extern "C" void org_jetbrains_skia_paragraph_TextStyle__1nAddFontFeature
   (kref __Kinstance, jlong ptr, jstring nameStr, jint value) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_TextStyle__1nAddFontFeature");
+    TODO("implement org_jetbrains_skia_paragraph_TextStyle__1nAddFontFeature");
 }
      
 #if 0 
@@ -246,7 +246,7 @@ extern "C" void org_jetbrains_skia_paragraph_TextStyle__1nSetFontSize
 
 extern "C" jobjectArray org_jetbrains_skia_paragraph_TextStyle__1nGetFontFamilies
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_TextStyle__1nGetFontFamilies");
+    TODO("implement org_jetbrains_skia_paragraph_TextStyle__1nGetFontFamilies");
 }
      
 #if 0 
@@ -261,7 +261,7 @@ extern "C" jobjectArray org_jetbrains_skia_paragraph_TextStyle__1nGetFontFamilie
 
 extern "C" void org_jetbrains_skia_paragraph_TextStyle__1nSetFontFamilies
   (kref __Kinstance, jlong ptr, jobjectArray familiesArray) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_TextStyle__1nSetFontFamilies");
+    TODO("implement org_jetbrains_skia_paragraph_TextStyle__1nSetFontFamilies");
 }
      
 #if 0 
@@ -276,7 +276,7 @@ extern "C" void org_jetbrains_skia_paragraph_TextStyle__1nSetFontFamilies
 
 extern "C" jobject org_jetbrains_skia_paragraph_TextStyle__1nGetHeight
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_TextStyle__1nGetHeight");
+    TODO("implement org_jetbrains_skia_paragraph_TextStyle__1nGetHeight");
 }
      
 #if 0 
@@ -335,7 +335,7 @@ extern "C" void org_jetbrains_skia_paragraph_TextStyle__1nSetTypeface
 
 extern "C" jstring org_jetbrains_skia_paragraph_TextStyle__1nGetLocale
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_TextStyle__1nGetLocale");
+    TODO("implement org_jetbrains_skia_paragraph_TextStyle__1nGetLocale");
 }
      
 #if 0 
@@ -350,7 +350,7 @@ extern "C" jstring org_jetbrains_skia_paragraph_TextStyle__1nGetLocale
 
 extern "C" void org_jetbrains_skia_paragraph_TextStyle__1nSetLocale
   (kref __Kinstance, jlong ptr, jstring locale) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_TextStyle__1nSetLocale");
+    TODO("implement org_jetbrains_skia_paragraph_TextStyle__1nSetLocale");
 }
      
 #if 0 
@@ -377,7 +377,7 @@ extern "C" void org_jetbrains_skia_paragraph_TextStyle__1nSetBaselineMode
 
 extern "C" jobject org_jetbrains_skia_paragraph_TextStyle__1nGetFontMetrics
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_TextStyle__1nGetFontMetrics");
+    TODO("implement org_jetbrains_skia_paragraph_TextStyle__1nGetFontMetrics");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/paragraph/TypefaceFontProvider.cc

@@ -16,7 +16,7 @@ extern "C" jlong org_jetbrains_skia_paragraph_TypefaceFontProvider__1nMake
 
 extern "C" void org_jetbrains_skia_paragraph_TypefaceFontProvider__1nRegisterTypeface
   (kref __Kinstance, jlong ptr, jlong typefacePtr, jstring aliasStr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_paragraph_TypefaceFontProvider__1nRegisterTypeface");
+    TODO("implement org_jetbrains_skia_paragraph_TypefaceFontProvider__1nRegisterTypeface");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/render.cc

@@ -31,7 +31,7 @@ extern "C" jlong org_jetbrains_skiko_RenderTargetsKt_makeMetalRenderTargetNative
 
 extern "C" jlong org_jetbrains_skiko_RenderTargetsKt_makeMetalContextNative
     (kref __Kinstance) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skiko_RenderTargetsKt_makeMetalContextNative");
+    TODO("implement org_jetbrains_skiko_RenderTargetsKt_makeMetalContextNative");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/shaper/FontMgrRunIterator.cc

@@ -8,7 +8,7 @@
 
 extern "C" jlong org_jetbrains_skia_shaper_FontMgrRunIterator__1nMake
   (kref __Kinstance, jlong textPtr, jlong fontPtr, jobject opts) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_shaper_FontMgrRunIterator__1nMake");
+    TODO("implement org_jetbrains_skia_shaper_FontMgrRunIterator__1nMake");
 }
      
 #if 0 
@@ -40,7 +40,7 @@ extern "C" jlong org_jetbrains_skia_shaper_FontMgrRunIterator__1nMake
 
 extern "C" jlong org_jetbrains_skia_shaper_FontMgrRunIterator__1nGetCurrentFont
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_shaper_FontMgrRunIterator__1nGetCurrentFont");
+    TODO("implement org_jetbrains_skia_shaper_FontMgrRunIterator__1nGetCurrentFont");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/shaper/Shaper.cc

@@ -57,7 +57,7 @@ extern "C" jlong org_jetbrains_skia_shaper_Shaper__1nMake
 
 extern "C" jlong org_jetbrains_skia_shaper_Shaper__1nShapeBlob
   (kref __Kinstance, jlong ptr, jstring textObj, jlong fontPtr, jobject opts, jfloat width, jfloat offsetX, jfloat offsetY) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_shaper_Shaper__1nShapeBlob");
+    TODO("implement org_jetbrains_skia_shaper_Shaper__1nShapeBlob");
 }
      
 #if 0 
@@ -103,7 +103,7 @@ extern "C" jlong org_jetbrains_skia_shaper_Shaper__1nShapeBlob
 
 extern "C" jlong org_jetbrains_skia_shaper_Shaper__1nShapeLine
   (kref __Kinstance, jlong ptr, jstring textObj, jlong fontPtr, jobject opts) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_shaper_Shaper__1nShapeLine");
+    TODO("implement org_jetbrains_skia_shaper_Shaper__1nShapeLine");
 }
      
 #if 0 
@@ -155,7 +155,7 @@ extern "C" jlong org_jetbrains_skia_shaper_Shaper__1nShapeLine
 extern "C" void org_jetbrains_skia_shaper_Shaper__1nShape
   (kref __Kinstance, jlong ptr, jlong textPtr, jobject fontRunIterObj, jobject bidiRunIterObj, jobject scriptRunIterObj, jobject languageRunIterObj, jobject opts, jfloat width, jobject runHandlerObj)
 {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_shaper_Shaper__1nShape");
+    TODO("implement org_jetbrains_skia_shaper_Shaper__1nShape");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/skottie/Animation.cc

@@ -19,7 +19,7 @@ extern "C" jlong org_jetbrains_skia_skottie_Animation__1nGetFinalizer
 
 extern "C" jlong org_jetbrains_skia_skottie_Animation__1nMakeFromString
   (kref __Kinstance, jstring dataStr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_skottie_Animation__1nMakeFromString");
+    TODO("implement org_jetbrains_skia_skottie_Animation__1nMakeFromString");
 }
      
 #if 0 
@@ -35,7 +35,7 @@ extern "C" jlong org_jetbrains_skia_skottie_Animation__1nMakeFromString
 
 extern "C" jlong org_jetbrains_skia_skottie_Animation__1nMakeFromFile
   (kref __Kinstance, jstring pathStr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_skottie_Animation__1nMakeFromFile");
+    TODO("implement org_jetbrains_skia_skottie_Animation__1nMakeFromFile");
 }
      
 #if 0 
@@ -112,7 +112,7 @@ extern "C" jfloat org_jetbrains_skia_skottie_Animation__1nGetOutPoint
 
 extern "C" jstring org_jetbrains_skia_skottie_Animation__1nGetVersion
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_skottie_Animation__1nGetVersion");
+    TODO("implement org_jetbrains_skia_skottie_Animation__1nGetVersion");
 }
      
 #if 0 
@@ -127,7 +127,7 @@ extern "C" jstring org_jetbrains_skia_skottie_Animation__1nGetVersion
 
 extern "C" jobject org_jetbrains_skia_skottie_Animation__1nGetSize
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_skottie_Animation__1nGetSize");
+    TODO("implement org_jetbrains_skia_skottie_Animation__1nGetSize");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/skottie/AnimationBuilder.cc

@@ -38,7 +38,7 @@ extern "C" void org_jetbrains_skia_skottie_AnimationBuilder__1nSetLogger
 
 extern "C" jlong org_jetbrains_skia_skottie_AnimationBuilder__1nBuildFromString
   (kref __Kinstance, jlong ptr, jstring dataStr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_skottie_AnimationBuilder__1nBuildFromString");
+    TODO("implement org_jetbrains_skia_skottie_AnimationBuilder__1nBuildFromString");
 }
      
 #if 0 
@@ -55,7 +55,7 @@ extern "C" jlong org_jetbrains_skia_skottie_AnimationBuilder__1nBuildFromString
 
 extern "C" jlong org_jetbrains_skia_skottie_AnimationBuilder__1nBuildFromFile
   (kref __Kinstance, jlong ptr, jstring pathStr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_skottie_AnimationBuilder__1nBuildFromFile");
+    TODO("implement org_jetbrains_skia_skottie_AnimationBuilder__1nBuildFromFile");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/skottie/Logger.cc

@@ -8,7 +8,7 @@ using namespace skottie;
 
 extern "C" jlong org_jetbrains_skia_skottie_Logger__1nMake
   (kref __Kinstance) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_skottie_Logger__1nMake");
+    TODO("implement org_jetbrains_skia_skottie_Logger__1nMake");
 }
      
 #if 0 
@@ -23,7 +23,7 @@ extern "C" jlong org_jetbrains_skia_skottie_Logger__1nMake
 
 extern "C" void org_jetbrains_skia_skottie_Logger__1nInit
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_skottie_Logger__1nInit");
+    TODO("implement org_jetbrains_skia_skottie_Logger__1nInit");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/svg/SVGDOM.cc

@@ -27,7 +27,7 @@ extern "C" jlong org_jetbrains_skia_svg_SVGDOM__1nGetRoot
 
 extern "C" jobject org_jetbrains_skia_svg_SVGDOM__1nGetContainerSize
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_svg_SVGDOM__1nGetContainerSize");
+    TODO("implement org_jetbrains_skia_svg_SVGDOM__1nGetContainerSize");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/generated/svg/SVGSVG.cc

@@ -14,7 +14,7 @@ extern "C" jint org_jetbrains_skia_svg_SVGSVG__1nGetTag
 
 extern "C" jobject org_jetbrains_skia_svg_SVGSVG__1nGetX
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_svg_SVGSVG__1nGetX");
+    TODO("implement org_jetbrains_skia_svg_SVGSVG__1nGetX");
 }
      
 #if 0 
@@ -29,7 +29,7 @@ extern "C" jobject org_jetbrains_skia_svg_SVGSVG__1nGetX
 
 extern "C" jobject org_jetbrains_skia_svg_SVGSVG__1nGetY
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_svg_SVGSVG__1nGetY");
+    TODO("implement org_jetbrains_skia_svg_SVGSVG__1nGetY");
 }
      
 #if 0 
@@ -44,7 +44,7 @@ extern "C" jobject org_jetbrains_skia_svg_SVGSVG__1nGetY
 
 extern "C" jobject org_jetbrains_skia_svg_SVGSVG__1nGetWidth
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_svg_SVGSVG__1nGetWidth");
+    TODO("implement org_jetbrains_skia_svg_SVGSVG__1nGetWidth");
 }
      
 #if 0 
@@ -59,7 +59,7 @@ extern "C" jobject org_jetbrains_skia_svg_SVGSVG__1nGetWidth
 
 extern "C" jobject org_jetbrains_skia_svg_SVGSVG__1nGetHeight
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_svg_SVGSVG__1nGetHeight");
+    TODO("implement org_jetbrains_skia_svg_SVGSVG__1nGetHeight");
 }
      
 #if 0 
@@ -74,7 +74,7 @@ extern "C" jobject org_jetbrains_skia_svg_SVGSVG__1nGetHeight
 
 extern "C" jobject org_jetbrains_skia_svg_SVGSVG__1nGetPreserveAspectRatio
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_svg_SVGSVG__1nGetPreserveAspectRatio");
+    TODO("implement org_jetbrains_skia_svg_SVGSVG__1nGetPreserveAspectRatio");
 }
      
 #if 0 
@@ -89,7 +89,7 @@ extern "C" jobject org_jetbrains_skia_svg_SVGSVG__1nGetPreserveAspectRatio
 
 extern "C" jobject org_jetbrains_skia_svg_SVGSVG__1nGetViewBox
   (kref __Kinstance, jlong ptr) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_svg_SVGSVG__1nGetViewBox");
+    TODO("implement org_jetbrains_skia_svg_SVGSVG__1nGetViewBox");
 }
      
 #if 0 
@@ -105,7 +105,7 @@ extern "C" jobject org_jetbrains_skia_svg_SVGSVG__1nGetViewBox
 
 extern "C" jobject org_jetbrains_skia_svg_SVGSVG__1nGetIntrinsicSize
   (kref __Kinstance, jlong ptr, float width, float height, float dpi) {
-    throw std::runtime_error("TODO: implement org_jetbrains_skia_svg_SVGSVG__1nGetIntrinsicSize");
+    TODO("implement org_jetbrains_skia_svg_SVGSVG__1nGetIntrinsicSize");
 }
      
 #if 0 

skiko/src/macosX64Main/cpp/include/native_interop.h

+#ifndef NATIVE_INTEROP
+#define NATIVE_INTEROP
+
+std::unique_ptr<SkMatrix> skMatrix(jfloatArray matrixArray);
+std::unique_ptr<SkM44> skM44(jfloatArray matrixArray);
+
+namespace skija {
+    namespace RRect {
+        SkRRect toSkRRect(jfloat left, jfloat top, jfloat right, jfloat bottom, jfloatArray jradii, jint size);
+    }
+}
+
+#endif // NATIVE_INTEROP

skiko/src/nativeInterop/cinterop/skia.def

-package = org.jetbrains.skiko.skia.native
-language = C++
-plugin = org.jetbrains.kotlin.native.interop.skia
-compilerOpts.osx = -x c++ -std=c++14 \
-    -DSK_GL \
-    -DSK_SUPPORT_GPU=1 \
-    -DSK_SHAPER_CORETEXT_AVAILABLE \
-    -DSK_BUILD_FOR_MAC \
-    -DSK_METAL \
-    -DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1 \
-    -DSK_FORCE_DISTANCE_FIELD_TEXT=0 \
-    -DSK_GAMMA_APPLY_TO_A8 \
-    -DSK_GAMMA_SRGB \
-    -DSK_SCALAR_TO_FLOAT_EXCLUDED \
-    -DSK_SHAPER_HARFBUZZ_AVAILABLE \
-    -DSK_SUPPORT_OPENCL=0 \
-    -DSK_UNICODE_AVAILABLE
-
-headers = modules/skparagraph/include/ParagraphBuilder.h modules/skparagraph/include/TypefaceFontProvider.h modules/skparagraph/include/Paragraph.h modules/skparagraph/include/FontCollection.h modules/skparagraph/include/Metrics.h modules/skparagraph/include/ParagraphStyle.h modules/skparagraph/include/TextStyle.h include/core/SkFontMgr.h include/core/SkFilterQuality.h include/core/SkCanvas.h include/core/SkData.h include/core/SkImage.h include/core/SkMath.h include/core/SkPathMeasure.h include/core/SkStream.h include/core/SkSurface.h include/core/SkSurfaceProps.h include/core/SkTypes.h include/core/SkPaint.h include/core/SkPictureRecorder.h include/core/SkPoint3.h include/core/SkImageInfo.h include/core/SkColor.h include/core/SkColorSpace.h include/utils/SkShadowUtils.h include/gpu/GrDirectContext.h include/gpu/GrBackendSurface.h include/gpu/GrConfig.h include/gpu/gl/GrGLInterface.h
-
-headerFilter = modules/skparagraph/include/ParagraphBuilder.h modules/skparagraph/include/TypefaceFontProvider.h modules/skparagraph/include/Paragraph.h modules/skparagraph/include/FontCollection.h modules/skparagraph/include/Metrics.h modules/skparagraph/include/ParagraphStyle.h modules/skparagraph/include/TextStyle.h include/core/SkFontMgr.h include/core/SkFilterQuality.h include/core/SkCanvas.h include/core/SkData.h include/core/SkImage.h include/core/SkMath.h include/core/SkPathMeasure.h include/core/SkStream.h include/core/SkSurface.h include/core/SkSurfaceProps.h include/core/SkTypes.h include/core/SkPaint.h include/core/SkPictureRecorder.h include/core/SkPoint3.h include/core/SkImageInfo.h include/core/SkColor.h include/core/SkColorSpace.h include/utils/SkShadowUtils.h include/gpu/GrDirectContext.h include/gpu/GrBackendSurface.h include/gpu/GrConfig.h include/gpu/gl/GrGLInterface.h
-
-# const overloads are not supported yet
-excludedFunctions = mapRect ptr priv
-
-linkerOpts.osx = -framework CoreServices -framework CoreText -framework CoreGraphics -framework Metal
-
----
-
-static inline skia::textlayout::Paragraph* __ParagraphBuilder__Build(skia::textlayout::ParagraphBuilder* paragraphBuilder) {
-    return paragraphBuilder->Build().release();
-}
-
-static inline skia::textlayout::ParagraphBuilder* __ParagraphBuilder__make(const skia::textlayout::ParagraphStyle* style, sk_sp<skia::textlayout::FontCollection> fontCollection) {
-    return skia::textlayout::ParagraphBuilder::make(*style, fontCollection).release();
-}
-
-// This is to wrokaround skia interop's inability to pass c++ classes by value
-static inline void __TextStyle__setFontStyle(skia::textlayout::TextStyle* textStyle, SkFontStyle& fontStyle) {
-    textStyle->setFontStyle(fontStyle);
-}
-
-
-// static inline SkFontStyle* __SkFontStyle__Normal() {
-//     return &SkFontStyle::Normal();
-// }
-
-// This is to workaround our inability to construct the default constructor for TypefaceFontProvider
-static inline skia::textlayout::TypefaceFontProvider* __TypefaceFontProvider() {
-    return new skia::textlayout::TypefaceFontProvider();
-}
-