ohos: Improve the skeleton code of ovCompose access to OHOS unified rendering (Render Service)

compose/common/src/androidMain/kotlin/androidx/compose/common/interop/LogPrintUtil.android.kt

@@ -21,7 +21,13 @@ actual object LogPrintUtil {
         get() = TODO("Not yet implemented")
         set(value) {}
 
-    actual fun verbose(message: String) {
-        println(message)
+    actual inline fun verbose(message: () -> String) {
+        if (isLogEnabled) {
+            println(message())
+        }
     }
+
+    actual var isLogEnabled: Boolean
+        get() = TODO("Not yet implemented")
+        set(value) {}
 }

compose/common/src/androidMain/kotlin/androidx/compose/common/interop/TraceUtil.kt

@@ -30,4 +30,8 @@ actual object TraceUtil {
     actual inline fun <T> traceSync(sectionName: String, block: () -> T): T {
         return block()
     }
+
+    actual var isTraceEnabled: Boolean
+        get() = TODO("Not yet implemented")
+        set(value) {}
 }

compose/common/src/commonMain/kotlin/androidx/compose/common/interop/LogPrintUtil.kt

@@ -22,5 +22,16 @@ interface LogPrintInterface {
 
 expect object LogPrintUtil {
     var logPrintImpl: LogPrintInterface?
-    fun verbose(message: String)
+    var isLogEnabled: Boolean
+
+    /**
+     * Lazy evaluation version of verbose. The message lambda is only evaluated when logging is enabled.
+     * This avoids unnecessary string concatenation when logging is disabled.
+     *
+     * Usage:
+     * ```
+     * LogPrintUtil.verbose { "AdaptiveCanvas::translate, dx: $dx, dy: $dy" }
+     * ```
+     */
+    inline fun verbose(message: () -> String)
 }

compose/common/src/commonMain/kotlin/androidx/compose/common/interop/TraceUtil.kt

@@ -24,6 +24,7 @@ interface SyncTraceInterface {
 expect object TraceUtil {
     var traceImpl: SyncTraceInterface?
     val globalVsyncId: Long
+    var isTraceEnabled: Boolean
     fun increaseVsyncId(): Long
     inline fun <T> traceSync(sectionName: String, block: () -> T): T
 }

compose/common/src/ohosArm64Main/kotlin/androidx/compose/common/interop/LogPrintUtil.ohosArm64.kt

@@ -20,22 +20,39 @@ import platform.ohos.LOG_APP
 import platform.ohos.LOG_DEBUG
 import platform.ohos.OH_LOG_Print
 
+
+/**
+ * Compile-time constant to control verbose logging.
+ * When set to false, the compiler will completely remove all verbose log code (zero overhead).
+ * When set to true, verbose logging is controlled at runtime via [LogPrintUtil.isLogEnabled].
+ */
+const val ENABLE_VERBOSE_LOG_COMPILE_TIME = false
+
 actual object LogPrintUtil {
+    private var _isLogEnabled: Boolean = true
 
     private val DefaultLogger = object : LogPrintInterface {
         override fun verbose(message: String) {
             OH_LOG_Print(
                 type = LOG_APP,
                 level = LOG_DEBUG,
                 domain = 0x0000u,
-                tag = "ovCompose",
+                tag = "ovComposeKt",
                 fmt = message
             )
         }
     }
     actual var logPrintImpl: LogPrintInterface? = DefaultLogger
 
-    actual fun verbose(message: String) {
-        this.logPrintImpl?.verbose(message)
+    actual inline fun verbose(message: () -> String) {
+        if (ENABLE_VERBOSE_LOG_COMPILE_TIME && isLogEnabled) {
+            this.logPrintImpl?.verbose(message())
+        }
     }
+
+    actual var isLogEnabled: Boolean
+        get() = _isLogEnabled
+        set(value) {
+            _isLogEnabled = value
+        }
 }

compose/common/src/ohosArm64Main/kotlin/androidx/compose/common/interop/TraceUtil.ohosArm64.kt

@@ -19,10 +19,24 @@ package androidx.compose.common.interop
 import platform.ohos.OH_HiTrace_FinishTrace
 import platform.ohos.OH_HiTrace_StartTrace
 
+
+/**
+ * Compile-time constant to control verbose tracing.
+ * When set to false, the compiler will completely remove all verbose trace code (zero overhead).
+ * When set to true, verbose tracing is controlled at runtime via [TraceUtil.isTraceEnabled].
+ */
+const val ENABLE_VERBOSE_TRACE_COMPILE_TIME = false
+
 actual object TraceUtil {
+    private var _isTraceEnabled = true
     private val DefaultTrace = object : SyncTraceInterface {
-        override fun startTrace(scene: String) { OH_HiTrace_StartTrace(scene) }
-        override fun endTrace(sectionName: String?) { OH_HiTrace_FinishTrace() }
+        override fun startTrace(scene: String) {
+            OH_HiTrace_StartTrace(scene)
+        }
+
+        override fun endTrace(sectionName: String?) {
+            OH_HiTrace_FinishTrace()
+        }
     }
 
     actual var traceImpl: SyncTraceInterface? = DefaultTrace
@@ -35,7 +49,21 @@ actual object TraceUtil {
     }
 
     actual inline fun <T> traceSync(sectionName: String, block: () -> T): T {
-        traceImpl?.startTrace("$sectionName[VsyncId:$globalVsyncId]")
-        return try { block() } finally { traceImpl?.endTrace(sectionName) }
+        if (ENABLE_VERBOSE_TRACE_COMPILE_TIME) {
+            if (isTraceEnabled) traceImpl?.startTrace("$sectionName[VsyncId:$globalVsyncId]")
+            return try {
+                block()
+            } finally {
+                if (isTraceEnabled) traceImpl?.endTrace(sectionName)
+            }
+        } else {
+            return block()
+        }
     }
+
+    actual var isTraceEnabled: Boolean
+        get() = _isTraceEnabled
+        set(value) {
+            _isTraceEnabled = value
+        }
 }

compose/common/src/uikitMain/kotlin/androidx/compose/common/interop/LogPrintUtil.darwin.kt

@@ -19,6 +19,7 @@ package androidx.compose.common.interop
 import platform.Foundation.NSLog
 
 actual object LogPrintUtil {
+    private var _isLogEnabled: Boolean = false
     private val DefaultLogger = object : LogPrintInterface {
         override fun verbose(message: String) {
             NSLog(message)
@@ -27,7 +28,15 @@ actual object LogPrintUtil {
 
     actual var logPrintImpl: LogPrintInterface? = DefaultLogger
 
-    actual fun verbose(message: String) {
-        this.logPrintImpl?.verbose("[shiqi]${message}")
+    actual inline fun verbose(message: () -> String) {
+        if (isLogEnabled) {
+            this.logPrintImpl?.verbose("[shiqi]${message()}")
+        }
     }
+
+    actual var isLogEnabled: Boolean
+        get() = _isLogEnabled
+        set(value) {
+            _isLogEnabled = value
+        }
 }

compose/common/src/uikitMain/kotlin/androidx/compose/common/interop/TraceUtil.darwin.kt

@@ -24,6 +24,7 @@ actual object TraceUtil {
     private val DefaultTrace = DefaultSignPostSyncTrace
     actual var traceImpl: SyncTraceInterface? = DefaultTrace
     private var _vsyncId = 0L
+    private var _isTraceEnabled = true
     actual val globalVsyncId: Long get() = _vsyncId
 
     actual fun increaseVsyncId(): Long {
@@ -32,9 +33,19 @@ actual object TraceUtil {
     }
 
     actual inline fun <T> traceSync(sectionName: String, block: () -> T): T {
-        this.traceImpl?.startTrace("$sectionName[VsyncId:${this.globalVsyncId}]")
-        return try { block() } finally { TraceUtil.traceImpl?.endTrace(sectionName) }
+        if (isTraceEnabled) this.traceImpl?.startTrace("$sectionName[VsyncId:${this.globalVsyncId}]")
+        return try {
+            block()
+        } finally {
+            if (isTraceEnabled) this.traceImpl?.endTrace(sectionName)
+        }
     }
+
+    actual var isTraceEnabled: Boolean
+        get() = _isTraceEnabled
+        set(value) {
+            _isTraceEnabled = value
+        }
 }
 
 object DefaultSignPostSyncTrace : SyncTraceInterface {

compose/export/export/src/ohosMain/kotlin/androidx/compose/export/ui/arkui/OHOSNativeCanvasProxy.kt

@@ -0,0 +1,30 @@
+@file:Suppress("FunctionName")
+
+package androidx.compose.export.ui.arkui
+
+import androidx.compose.export.annotation.InternalExportApi
+import androidx.compose.ui.platform.nativefoundation._invokeKotlinAsyncTask
+import androidx.compose.ui.platform.nativefoundation._invokeKotlinMainThreadCallback
+
+
+/**
+ * C++回调函数，用于异步执行Kotlin lambda
+ * 这个函数会被C++侧调用（在后台线程）
+ *
+ * @param stableRefPtr StableRef指针，指向Kotlin lambda
+ * @return 执行结果（PixelMap指针）
+ */
+@InternalExportApi
+@CName("invokeKotlinAsyncTask")
+fun _Export_invokeKotlinAsyncTask(stableRefPtr: Long) = _invokeKotlinAsyncTask(stableRefPtr)
+
+@InternalExportApi
+@CName("invokeKotlinMainThreadCallback")
+fun _Export_invokeKotlinMainThreadCallback(
+    stableRefPtr: Long,
+    renderNodePtr: Long,
+    pixelMapPtr: Long
+) =
+    _invokeKotlinMainThreadCallback(stableRefPtr, renderNodePtr, pixelMapPtr)
+
+

compose/foundation/foundation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/Offset.kt

@@ -16,6 +16,7 @@
 
 package androidx.compose.foundation.layout
 
+import androidx.compose.common.interop.TraceUtil
 import androidx.compose.runtime.Stable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.Measurable

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Background.kt

@@ -17,6 +17,7 @@
 package androidx.compose.foundation
 
 import androidx.annotation.FloatRange
+import androidx.compose.common.interop.TraceUtil
 import androidx.compose.runtime.Stable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Size

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/lazy/LazyListMeasuredItem.kt

@@ -22,6 +22,7 @@ import androidx.compose.foundation.lazy.layout.LazyLayoutAnimation.Companion.Not
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.graphics.GraphicsLayerScope
 import androidx.compose.ui.layout.Placeable
+import androidx.compose.ui.node.LayerSourceType
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.util.fastForEach
@@ -207,9 +208,21 @@ internal class LazyListMeasuredItem @ExperimentalFoundationApi constructor(
             }
             offset += visualOffset
             if (isVertical) {
-                placeable.placeWithLayer(offset, layerBlock = layerBlock)
+                placeable.placeWithLayer(
+                    offset, 
+                    layerBlock = layerBlock,
+                    // region Huawei Code
+                    sourceType = LayerSourceType.LAZY_LIST_ITEM
+                    // end region
+                )
             } else {
-                placeable.placeRelativeWithLayer(offset, layerBlock = layerBlock)
+                placeable.placeRelativeWithLayer(
+                    offset, 
+                    layerBlock = layerBlock,
+                    // region Huawei Code
+                    sourceType = LayerSourceType.LAZY_LIST_ITEM
+                    // end region
+                )
             }
         }
     }

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextAnnotatedStringNode.kt

@@ -19,6 +19,7 @@ package androidx.compose.foundation.text.modifiers
 import androidx.compose.foundation.text.DefaultMinLines
 import androidx.compose.runtime.ComposeTabService
 import androidx.compose.runtime.EnableIOSParagraph
+import androidx.compose.runtime.EnableOHOSParagraph
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -584,7 +585,7 @@ internal class TextAnnotatedStringNode(
             val textLayoutResult = layoutCache.textLayoutResult
             val localParagraph = textLayoutResult.multiParagraph
             // region Tencent Code
-            if (drawInSkia || EnableIOSParagraph) {
+            if (drawInSkia || EnableIOSParagraph || EnableOHOSParagraph) {
                 localCanvas = canvas
             } else {
                 val width = textLayoutResult.size.width

compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleNode.kt

@@ -19,6 +19,7 @@ package androidx.compose.foundation.text.modifiers
 import androidx.compose.foundation.text.DefaultMinLines
 import androidx.compose.runtime.ComposeTabService
 import androidx.compose.runtime.EnableIOSParagraph
+import androidx.compose.runtime.EnableOHOSParagraph
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -95,6 +96,7 @@ internal class TextStringSimpleNode(
         PlatformTextNodeFactory.instance.createPlatformDelegateTextNode()
     private var localBitmap: ImageBitmap? = null
     private var localCanvas: Canvas? = null
+
     // endregion
     private var baselineCache: MutableMap<AlignmentLine, Int>? = null
     private var _layoutCache: ParagraphLayoutCache? = null
@@ -487,15 +489,15 @@ internal class TextStringSimpleNode(
 
         val localParagraph = requireNotNull(layoutCache.paragraph) { "no paragraph" }
         // region Tencent Code
-        if (ComposeTabService.textAsyncPaint && !drawInSkia) {
+        if (ComposeTabService.textAsyncPaint && !drawInSkia && platformTextDelegate != null) {
             asyncDrawIntoCanvas(localParagraph)
             return
         }
         // endregion
         drawIntoCanvas { canvas ->
             var currentParagraphHashCode = 0
             // region Tencent Code
-            if (drawInSkia || EnableIOSParagraph) {
+            if (drawInSkia || EnableIOSParagraph || EnableOHOSParagraph) {
                 localCanvas = canvas
             } else {
                 currentParagraphHashCode = paragraphHashCode()
@@ -571,6 +573,7 @@ internal class TextStringSimpleNode(
             }
         }
     }
+
     private fun paragraphHashCode(): Int {
         var result = text.hashCode()
         result = 31 * result + style.hashCode()

compose/runtime/runtime/build.gradle

@@ -116,6 +116,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
                 implementation(libs.kotlinCoroutinesCore)
                 implementation(libs.atomicFu)
                 implementation(project(":collection:collection"))
+                api(project(":compose:common"))
             }
             jvmMain.dependencies {
                 implementation(libs.kotlinStdlib)

compose/runtime/runtime/src/commonMain/kotlin/androidx/compose/runtime/BroadcastFrameClock.kt

@@ -16,6 +16,7 @@
 
 package androidx.compose.runtime
 
+import androidx.compose.common.interop.TraceUtil
 import androidx.compose.runtime.snapshots.fastForEach
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resumeWithException
@@ -59,18 +60,20 @@ class BroadcastFrameClock(
      * [sendFrame].
      */
     fun sendFrame(timeNanos: Long) {
-        synchronized(lock) {
-            // Rotate the lists so that if a resumed continuation on an immediate dispatcher
-            // bound to the thread calling sendFrame immediately awaits again we don't disrupt
-            // iteration of resuming the rest.
-            val toResume = awaiters
-            awaiters = spareList
-            spareList = toResume
+        TraceUtil.traceSync("BroadcastFrameClock.sendFrame") {
+            synchronized(lock) {
+                // Rotate the lists so that if a resumed continuation on an immediate dispatcher
+                // bound to the thread calling sendFrame immediately awaits again we don't disrupt
+                // iteration of resuming the rest.
+                val toResume = awaiters
+                awaiters = spareList
+                spareList = toResume
 
-            for (i in 0 until toResume.size) {
-                toResume[i].resume(timeNanos)
+                for (i in 0 until toResume.size) {
+                    toResume[i].resume(timeNanos)
+                }
+                toResume.clear()
             }
-            toResume.clear()
         }
     }