Make text and font arguments of Shaper methods non-null (#499)

skiko/src/commonMain/kotlin/org/jetbrains/skia/shaper/FontMgrRunIterator.kt

@@ -11,7 +11,7 @@ import org.jetbrains.skia.impl.Stats
 import org.jetbrains.skia.impl.getPtr
 import org.jetbrains.skia.impl.reachabilityBarrier
 
-class FontMgrRunIterator(text: ManagedString?, manageText: Boolean, font: Font?, opts: ShapingOptions) :
+class FontMgrRunIterator(text: ManagedString, manageText: Boolean, font: Font, opts: ShapingOptions) :
     ManagedRunIterator<FontRun?>(
         _nMake(getPtr(text), getPtr(font), getPtr(opts.fontMgr), opts._booleanPropsToInt()), text, manageText
     ) {
@@ -21,11 +21,11 @@ class FontMgrRunIterator(text: ManagedString?, manageText: Boolean, font: Font?,
         }
     }
 
-    private val _font: Font? = font
+    private val _font: Font = font
     private val _fontMgr: FontMgr? = opts.fontMgr
 
-    constructor(text: String?, font: Font?, opts: ShapingOptions) : this(ManagedString(text), true, font, opts)
-    constructor(text: String?, font: Font?) : this(ManagedString(text), true, font, ShapingOptions.DEFAULT)
+    constructor(text: String, font: Font, opts: ShapingOptions) : this(ManagedString(text), true, font, opts)
+    constructor(text: String, font: Font) : this(ManagedString(text), true, font, ShapingOptions.DEFAULT)
 
     override operator fun next(): FontRun {
         return try {

skiko/src/commonMain/kotlin/org/jetbrains/skia/shaper/HbIcuScriptRunIterator.kt

@@ -9,7 +9,7 @@ import org.jetbrains.skia.impl.Stats
 import org.jetbrains.skia.impl.getPtr
 import org.jetbrains.skia.impl.reachabilityBarrier
 
-class HbIcuScriptRunIterator(text: ManagedString?, manageText: Boolean) : ManagedRunIterator<ScriptRun?>(
+class HbIcuScriptRunIterator(text: ManagedString, manageText: Boolean) : ManagedRunIterator<ScriptRun?>(
     _nMake(
         getPtr(text)
     ), text, manageText

skiko/src/commonMain/kotlin/org/jetbrains/skia/shaper/IcuBidiRunIterator.kt

@@ -9,7 +9,7 @@ import org.jetbrains.skia.impl.Stats
 import org.jetbrains.skia.impl.getPtr
 import org.jetbrains.skia.impl.reachabilityBarrier
 
-class IcuBidiRunIterator(text: ManagedString?, manageText: Boolean, bidiLevel: Int) : ManagedRunIterator<BidiRun?>(
+class IcuBidiRunIterator(text: ManagedString, manageText: Boolean, bidiLevel: Int) : ManagedRunIterator<BidiRun?>(
     _nMake(getPtr(text), bidiLevel), text, manageText
 ) {
     companion object {
@@ -18,7 +18,7 @@ class IcuBidiRunIterator(text: ManagedString?, manageText: Boolean, bidiLevel: I
         }
     }
 
-    constructor(text: String?, bidiLevel: Int) : this(ManagedString(text), true, bidiLevel) {}
+    constructor(text: String, bidiLevel: Int) : this(ManagedString(text), true, bidiLevel) {}
 
     override operator fun next(): BidiRun {
         return try {

skiko/src/commonMain/kotlin/org/jetbrains/skia/shaper/Shaper.kt

@@ -90,19 +90,19 @@ class Shaper internal constructor(ptr: NativePointer) : Managed(ptr, _FinalizerH
         }
     }
 
-    fun shape(text: String?, font: Font?): TextBlob? {
+    fun shape(text: String, font: Font): TextBlob? {
         return shape(text, font, ShapingOptions.DEFAULT, Float.POSITIVE_INFINITY, Point.Companion.ZERO)
     }
 
-    fun shape(text: String?, font: Font?, width: Float): TextBlob? {
+    fun shape(text: String, font: Font, width: Float): TextBlob? {
         return shape(text, font, ShapingOptions.DEFAULT, width, Point.Companion.ZERO)
     }
 
-    fun shape(text: String?, font: Font?, width: Float, offset: Point): TextBlob? {
+    fun shape(text: String, font: Font, width: Float, offset: Point): TextBlob? {
         return shape(text, font, ShapingOptions.DEFAULT, width, offset)
     }
 
-    fun shape(text: String?, font: Font?, opts: ShapingOptions, width: Float, offset: Point): TextBlob? {
+    fun shape(text: String, font: Font, opts: ShapingOptions, width: Float, offset: Point): TextBlob? {
         return try {
             Stats.onNativeCall()
             val managedString = ManagedString(text)
@@ -128,7 +128,7 @@ class Shaper internal constructor(ptr: NativePointer) : Managed(ptr, _FinalizerH
 
     fun shape(
         text: String,
-        font: Font?,
+        font: Font,
         opts: ShapingOptions,
         width: Float,
         runHandler: RunHandler

skiko/src/nativeJsMain/cpp/shaper/Shaper.cc

@@ -46,7 +46,7 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skia_shaper_Shaper__1nMakeCoreText() {
     #ifdef SK_SHAPER_CORETEXT_AVAILABLE
         return reinterpret_cast<KNativePointer>(SkShaper::MakeCoreText().release());
     #else
-        return 0;
+        return nullptr;
     #endif
 }
 
@@ -63,7 +63,7 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skia_shaper_Shaper__1nShapeBlob
     SkString& text = *(reinterpret_cast<SkString*>(textPtr));
 
     std::shared_ptr<UBreakIterator> graphemeIter = skija::shaper::graphemeBreakIterator(text);
-    if (!graphemeIter) return 0;
+    if (!graphemeIter) return nullptr;
     SkFont* font = reinterpret_cast<SkFont*>(fontPtr);
 
     std::vector<SkShaper::Feature> features = skija::shaper::ShapingOptions::getFeaturesFromIntsArray(optsFeatures, optsFeaturesLen);
@@ -74,13 +74,13 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skia_shaper_Shaper__1nShapeBlob
 
     uint8_t defaultBiDiLevel = isLeftToRight ? UBIDI_DEFAULT_LTR : UBIDI_DEFAULT_RTL;
     std::unique_ptr<SkShaper::BiDiRunIterator> bidiRunIter(SkShaper::MakeBiDiRunIterator(text.c_str(), text.size(), defaultBiDiLevel));
-    if (!bidiRunIter) return 0;
+    if (!bidiRunIter) return nullptr;
 
     std::unique_ptr<SkShaper::ScriptRunIterator> scriptRunIter(SkShaper::MakeHbIcuScriptRunIterator(text.c_str(), text.size()));
-    if (!scriptRunIter) return 0;
+    if (!scriptRunIter) return nullptr;
 
     std::unique_ptr<SkShaper::LanguageRunIterator> languageRunIter(SkShaper::MakeStdLanguageRunIterator(text.c_str(), text.size()));
-    if (!languageRunIter) return 0;
+    if (!languageRunIter) return nullptr;
 
      FontRunIterator fontRunIter(
         text.c_str(),
@@ -121,13 +121,13 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skia_shaper_Shaper__1nShapeLine
 
     uint8_t defaultBiDiLevel = isLeftToRight ? UBIDI_DEFAULT_LTR : UBIDI_DEFAULT_RTL;
     std::unique_ptr<SkShaper::BiDiRunIterator> bidiRunIter(SkShaper::MakeBiDiRunIterator(text.c_str(), text.size(), defaultBiDiLevel));
-    if (!bidiRunIter) return 0;
+    if (!bidiRunIter) return nullptr;
 
     std::unique_ptr<SkShaper::ScriptRunIterator> scriptRunIter(SkShaper::MakeHbIcuScriptRunIterator(text.c_str(), text.size()));
-    if (!scriptRunIter) return 0;
+    if (!scriptRunIter) return nullptr;
 
     std::unique_ptr<SkShaper::LanguageRunIterator> languageRunIter(SkShaper::MakeStdLanguageRunIterator(text.c_str(), text.size()));
-    if (!languageRunIter) return 0;
+    if (!languageRunIter) return nullptr;
 
     FontRunIterator fontRunIter(
         text.c_str(),