Deprecate NativeCanvas typealias

MatkovIvan · MatkovIvan · commit abcefcd6794e · 2025-10-30T20:24:51.000+01:00
Change-Id: I26098f1b585f1e902ab4cab83f5525beb4dc54eb
diff --git a/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/VariableFontsDemo.kt b/compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/VariableFontsDemo.kt
@@ -42,8 +42,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asAndroidCanvas
 import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
-import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.ExperimentalTextApi
 import androidx.compose.ui.text.font.DeviceFontFamilyName
@@ -236,7 +236,7 @@ fun DeviceNamedFontFamilyFont(weight: Int, italic: Boolean) {
         val textPaint = remember { TextPaint() }
         Canvas(modifier = Modifier.fillMaxWidth().height(40.dp)) {
             this.drawIntoCanvas {
-                val nativeCanvas = drawContext.canvas.nativeCanvas
+                val nativeCanvas = drawContext.canvas.asAndroidCanvas()
                 textPaint.typeface = Typeface.create("sans-serif", Typeface.NORMAL)
                 textPaint.textSize = 24f
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
diff --git a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/AndroidOverscroll.android.kt b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/AndroidOverscroll.android.kt
@@ -43,12 +43,11 @@ import androidx.compose.ui.geometry.center
 import androidx.compose.ui.geometry.isSpecified
 import androidx.compose.ui.graphics.Canvas
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.NativeCanvas
+import androidx.compose.ui.graphics.asAndroidCanvas
 import androidx.compose.ui.graphics.drawscope.ContentDrawScope
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.drawscope.draw
 import androidx.compose.ui.graphics.drawscope.translate
-import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.input.nestedscroll.NestedScrollSource
 import androidx.compose.ui.input.pointer.PointerId
@@ -205,7 +204,7 @@ private class StretchOverscrollNode(
     @Suppress("KotlinConstantConditions")
     override fun ContentDrawScope.draw() {
         overscrollEffect.updateSize(size)
-        val canvas = drawContext.canvas.nativeCanvas
+        val canvas = drawContext.canvas.asAndroidCanvas()
         overscrollEffect.redrawSignal.value // <-- value read to redraw if needed
         if (size.isEmpty()) {
             // Draw any out of bounds content
@@ -380,26 +379,26 @@ private class StretchOverscrollNode(
                 isRightNegationStretched()
         }
 
-    private fun drawLeftStretch(left: EdgeEffect, canvas: NativeCanvas): Boolean {
+    private fun drawLeftStretch(left: EdgeEffect, canvas: android.graphics.Canvas): Boolean {
         return drawWithRotation(rotationDegrees = 270f, edgeEffect = left, canvas = canvas)
     }
 
-    private fun drawTopStretch(top: EdgeEffect, canvas: NativeCanvas): Boolean {
+    private fun drawTopStretch(top: EdgeEffect, canvas: android.graphics.Canvas): Boolean {
         return drawWithRotation(rotationDegrees = 0f, edgeEffect = top, canvas = canvas)
     }
 
-    private fun drawRightStretch(right: EdgeEffect, canvas: NativeCanvas): Boolean {
+    private fun drawRightStretch(right: EdgeEffect, canvas: android.graphics.Canvas): Boolean {
         return drawWithRotation(rotationDegrees = 90f, edgeEffect = right, canvas = canvas)
     }
 
-    private fun drawBottomStretch(bottom: EdgeEffect, canvas: NativeCanvas): Boolean {
+    private fun drawBottomStretch(bottom: EdgeEffect, canvas: android.graphics.Canvas): Boolean {
         return drawWithRotation(rotationDegrees = 180f, edgeEffect = bottom, canvas = canvas)
     }
 
     private fun drawWithRotation(
         rotationDegrees: Float,
         edgeEffect: EdgeEffect,
-        canvas: NativeCanvas,
+        canvas: android.graphics.Canvas,
     ): Boolean {
         if (rotationDegrees == 0f) {
             val needsInvalidate = edgeEffect.draw(canvas)
@@ -433,7 +432,7 @@ private class GlowOverscrollNode(
         }
         drawContent()
         overscrollEffect.redrawSignal.value // <-- value read to redraw if needed
-        val canvas = drawContext.canvas.nativeCanvas
+        val canvas = drawContext.canvas.asAndroidCanvas()
         var needsInvalidate = false
         with(edgeEffectWrapper) {
             if (isLeftAnimating()) {
@@ -504,7 +503,7 @@ private class GlowOverscrollNode(
         rotationDegrees: Float,
         offset: Offset,
         edgeEffect: EdgeEffect,
-        canvas: NativeCanvas,
+        canvas: android.graphics.Canvas,
     ): Boolean {
         val restore = canvas.save()
         canvas.rotate(rotationDegrees)
diff --git a/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/text/contextmenu/internal/DefaultTextContextMenuDropdownProvider.android.kt b/compose/foundation/foundation/src/androidMain/kotlin/androidx/compose/foundation/text/contextmenu/internal/DefaultTextContextMenuDropdownProvider.android.kt
@@ -50,9 +50,9 @@ import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.draw.paint
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.asAndroidCanvas
 import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
 import androidx.compose.ui.graphics.isUnspecified
-import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.LayoutCoordinates
 import androidx.compose.ui.platform.LocalContext
@@ -277,7 +277,7 @@ private object TextContextMenuHelperApi28 {
             Modifier.size(ContextMenuSpec.IconSize).drawBehind {
                 drawIntoCanvas { canvas ->
                     drawable.setBounds(0, 0, size.width.toInt(), size.height.toInt())
-                    drawable.draw(canvas.nativeCanvas)
+                    drawable.draw(canvas.asAndroidCanvas())
                 }
             }
         )
diff --git a/compose/ui/ui-graphics/src/androidDeviceTest/kotlin/androidx/compose/ui/graphics/AndroidCanvasTest.kt b/compose/ui/ui-graphics/src/androidDeviceTest/kotlin/androidx/compose/ui/graphics/AndroidCanvasTest.kt
@@ -628,7 +628,7 @@ class AndroidCanvasTest {
             val androidCanvas = Canvas(canvas)
             androidCanvas.enableZ()
             for (i in 0 until childCount) {
-                drawChild(androidCanvas.nativeCanvas, getChildAt(i), drawingTime)
+                drawChild(androidCanvas.asAndroidCanvas(), getChildAt(i), drawingTime)
             }
             androidCanvas.disableZ()
             drawLatch.countDown()
diff --git a/compose/ui/ui-graphics/src/androidDeviceTest/kotlin/androidx/compose/ui/graphics/layer/AndroidGraphicsLayerTest.kt b/compose/ui/ui-graphics/src/androidDeviceTest/kotlin/androidx/compose/ui/graphics/layer/AndroidGraphicsLayerTest.kt
@@ -44,13 +44,13 @@ import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.graphics.PixelMap
 import androidx.compose.ui.graphics.TestActivity
 import androidx.compose.ui.graphics.TileMode
+import androidx.compose.ui.graphics.asAndroidCanvas
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
 import androidx.compose.ui.graphics.drawscope.inset
 import androidx.compose.ui.graphics.drawscope.translate
-import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.graphics.toPixelMap
 import androidx.compose.ui.unit.Density
@@ -1889,7 +1889,7 @@ class AndroidGraphicsLayerTest {
                                 Ltr,
                                 IntSize(target.width, target.height),
                             ) {
-                                drawIntoCanvas { canvas -> target.draw(canvas.nativeCanvas) }
+                                drawIntoCanvas { canvas -> target.draw(canvas.asAndroidCanvas()) }
                             }
                             recordLatch.countDown()
                         }
diff --git a/compose/ui/ui-graphics/src/androidDeviceTest/kotlin/androidx/compose/ui/graphics/shadow/ShadowTestHelper.kt b/compose/ui/ui-graphics/src/androidDeviceTest/kotlin/androidx/compose/ui/graphics/shadow/ShadowTestHelper.kt
@@ -34,9 +34,9 @@ import androidx.compose.ui.graphics.ImageShader
 import androidx.compose.ui.graphics.PixelMap
 import androidx.compose.ui.graphics.ShaderBrush
 import androidx.compose.ui.graphics.TestActivity
+import androidx.compose.ui.graphics.asAndroidCanvas
 import androidx.compose.ui.graphics.drawscope.CanvasDrawScope
 import androidx.compose.ui.graphics.drawscope.DrawScope
-import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.graphics.toPixelMap
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.LayoutDirection
@@ -83,7 +83,7 @@ fun shadowTest(block: DrawScope.() -> Unit, verify: (PixelMap) -> Unit) {
             } else {
                 val bitmap = ImageBitmap(TEST_WIDTH, TEST_HEIGHT)
                 val canvas = ComposeCanvas(bitmap)
-                target!!.draw(canvas.nativeCanvas)
+                target!!.draw(canvas.asAndroidCanvas())
                 bitmap.toPixelMap()
             }
         verify(pixelMap)
diff --git a/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidCanvas.android.kt b/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/AndroidCanvas.android.kt
@@ -22,6 +22,10 @@ import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.util.fastForEach
 
+@Deprecated(
+    message = "Use android.graphics.Canvas directly instead",
+    replaceWith = ReplaceWith("android.graphics.Canvas"),
+)
 actual typealias NativeCanvas = android.graphics.Canvas
 
 /** Create a new Canvas instance that targets its drawing commands to the provided [ImageBitmap] */
@@ -30,6 +34,12 @@ internal actual fun ActualCanvas(image: ImageBitmap): Canvas =
 
 fun Canvas(c: android.graphics.Canvas): Canvas = AndroidCanvas().apply { internalCanvas = c }
 
+fun android.graphics.Canvas.asComposeCanvas(): Canvas =
+    AndroidCanvas().apply { internalCanvas = this@asComposeCanvas }
+
+fun Canvas.asAndroidCanvas(): android.graphics.Canvas =
+    (this as AndroidCanvas).internalCanvas
+
 /**
  * Holder class that is used to issue scoped calls to a [Canvas] from the framework equivalent
  * canvas without having to allocate an object on each draw call
@@ -46,6 +56,11 @@ class CanvasHolder {
 }
 
 /** Return an instance of the native primitive that implements the Canvas interface */
+@Suppress("DEPRECATION")
+@Deprecated(
+    message = "Use Canvas.asAndroidCanvas() extension instead",
+    replaceWith = ReplaceWith("asAndroidCanvas()"),
+)
 actual val Canvas.nativeCanvas: NativeCanvas
     get() = (this as AndroidCanvas).internalCanvas
 
@@ -58,7 +73,7 @@ internal class AndroidCanvas() : Canvas {
 
     // Keep the internal canvas as a var prevent having to allocate an AndroidCanvas
     // instance on each draw call
-    @PublishedApi internal var internalCanvas: NativeCanvas = EmptyCanvas
+    @PublishedApi internal var internalCanvas: android.graphics.Canvas = EmptyCanvas
 
     private var srcRect: android.graphics.Rect? = null
 
diff --git a/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/layer/AndroidGraphicsLayer.android.kt b/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/layer/AndroidGraphicsLayer.android.kt
@@ -35,6 +35,7 @@ import androidx.compose.ui.graphics.Outline
 import androidx.compose.ui.graphics.Paint
 import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.graphics.RenderEffect
+import androidx.compose.ui.graphics.asAndroidCanvas
 import androidx.compose.ui.graphics.asAndroidPaint
 import androidx.compose.ui.graphics.asAndroidPath
 import androidx.compose.ui.graphics.asImageBitmap
@@ -43,7 +44,6 @@ import androidx.compose.ui.graphics.drawscope.DefaultDensity
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.drawscope.clipPath
 import androidx.compose.ui.graphics.drawscope.draw
-import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.IntSize
@@ -479,7 +479,7 @@ actual class GraphicsLayer internal constructor(internal val impl: GraphicsLayer
     }
 
     internal fun drawForPersistence(canvas: Canvas) {
-        if (canvas.nativeCanvas.isHardwareAccelerated || impl.supportsSoftwareRendering) {
+        if (canvas.asAndroidCanvas().isHardwareAccelerated || impl.supportsSoftwareRendering) {
             recreateDisplayListIfNeeded()
             impl.draw(canvas)
         }
@@ -519,7 +519,7 @@ actual class GraphicsLayer internal constructor(internal val impl: GraphicsLayer
         if (useZ) {
             canvas.enableZ()
         }
-        val androidCanvas = canvas.nativeCanvas
+        val androidCanvas = canvas.asAndroidCanvas()
         val softwareRendered = !androidCanvas.isHardwareAccelerated
         if (softwareRendered) {
             transformCanvas(androidCanvas)
@@ -547,7 +547,7 @@ actual class GraphicsLayer internal constructor(internal val impl: GraphicsLayer
 
         parentLayer?.addSubLayer(this)
 
-        if (canvas.nativeCanvas.isHardwareAccelerated || impl.supportsSoftwareRendering) {
+        if (canvas.asAndroidCanvas().isHardwareAccelerated || impl.supportsSoftwareRendering) {
             impl.draw(canvas)
         } else {
             val drawScope = softwareDrawScope ?: CanvasDrawScope().also { softwareDrawScope = it }
diff --git a/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/layer/GraphicsLayerV23.android.kt b/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/layer/GraphicsLayerV23.android.kt
@@ -31,11 +31,11 @@ import androidx.compose.ui.graphics.CanvasHolder
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.RenderEffect
+import androidx.compose.ui.graphics.asAndroidCanvas
 import androidx.compose.ui.graphics.asAndroidColorFilter
 import androidx.compose.ui.graphics.drawscope.CanvasDrawScope
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.drawscope.draw
-import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.graphics.toPorterDuffMode
 import androidx.compose.ui.unit.Density
@@ -336,7 +336,7 @@ internal class GraphicsLayerV23(
     }
 
     override fun draw(canvas: androidx.compose.ui.graphics.Canvas) {
-        (canvas.nativeCanvas as DisplayListCanvas).drawRenderNode(renderNode)
+        (canvas.asAndroidCanvas() as DisplayListCanvas).drawRenderNode(renderNode)
     }
 
     override fun calculateMatrix(): Matrix {
diff --git a/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/layer/GraphicsViewLayer.android.kt b/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/layer/GraphicsViewLayer.android.kt
@@ -35,6 +35,7 @@ import androidx.compose.ui.graphics.CanvasHolder
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.RenderEffect
+import androidx.compose.ui.graphics.asAndroidCanvas
 import androidx.compose.ui.graphics.asAndroidColorFilter
 import androidx.compose.ui.graphics.drawscope.CanvasDrawScope
 import androidx.compose.ui.graphics.drawscope.DefaultDensity
@@ -44,7 +45,6 @@ import androidx.compose.ui.graphics.layer.GraphicsLayerImpl.Companion.DefaultDra
 import androidx.compose.ui.graphics.layer.SurfaceUtils.isLockHardwareCanvasAvailable
 import androidx.compose.ui.graphics.layer.view.DrawChildContainer
 import androidx.compose.ui.graphics.layer.view.PlaceholderHardwareCanvas
-import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.graphics.toPorterDuffMode
 import androidx.compose.ui.unit.Density
@@ -469,7 +469,7 @@ internal class GraphicsViewLayer(
 
     override fun draw(canvas: androidx.compose.ui.graphics.Canvas) {
         updateClipBounds()
-        val androidCanvas = canvas.nativeCanvas
+        val androidCanvas = canvas.asAndroidCanvas()
         if (androidCanvas.isHardwareAccelerated) {
             layerContainer.drawChild(canvas, viewLayer, viewLayer.drawingTime)
         } else {
diff --git a/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/layer/view/ViewLayerContainer.android.kt b/compose/ui/ui-graphics/src/androidMain/kotlin/androidx/compose/ui/graphics/layer/view/ViewLayerContainer.android.kt
@@ -24,8 +24,8 @@ import android.view.ViewGroup
 import android.view.ViewParent
 import androidx.compose.ui.graphics.Canvas
 import androidx.compose.ui.graphics.R
+import androidx.compose.ui.graphics.asAndroidCanvas
 import androidx.compose.ui.graphics.layer.ViewLayer
-import androidx.compose.ui.graphics.nativeCanvas
 
 /** The container we will use for [GraphicsViewLayer]s. */
 internal class ViewLayerContainer(context: Context) : DrawChildContainer(context) {
@@ -110,6 +110,6 @@ internal open class DrawChildContainer(context: Context) : ViewGroup(context) {
 
     // we change visibility for this method so ViewLayer can use it for drawing
     internal fun drawChild(canvas: Canvas, view: View, drawingTime: Long) {
-        super.drawChild(canvas.nativeCanvas, view, drawingTime)
+        super.drawChild(canvas.asAndroidCanvas(), view, drawingTime)
     }
 }
diff --git a/compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Canvas.kt b/compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Canvas.kt
@@ -27,6 +27,7 @@ fun Canvas(image: ImageBitmap): Canvas = ActualCanvas(image)
 
 internal expect fun ActualCanvas(image: ImageBitmap): Canvas
 
+@Deprecated("Use direct reference to platform type instead of typealias")
 expect class NativeCanvas
 
 /**
@@ -38,7 +39,7 @@ expect class NativeCanvas
  *
  * [Canvas.saveLayer], which does the same thing but additionally also groups the commands
  */
-/* expect */ inline fun Canvas.withSave(block: () -> Unit) {
+inline fun Canvas.withSave(block: () -> Unit) {
     try {
         save()
         block()
@@ -147,6 +148,8 @@ fun Canvas.scale(sx: Float, sy: Float = sx, pivotX: Float, pivotY: Float) {
 }
 
 /** Return an instance of the native primitive that implements the Canvas interface */
+@Suppress("DEPRECATION")
+@Deprecated("Use platform-specific extension to get platform reference")
 expect val Canvas.nativeCanvas: NativeCanvas
 
 @JvmDefaultWithCompatibility
diff --git a/compose/ui/ui-graphics/src/commonStubsMain/kotlin/androidx/compose/ui/graphics/Canvas.commonStubs.kt b/compose/ui/ui-graphics/src/commonStubsMain/kotlin/androidx/compose/ui/graphics/Canvas.commonStubs.kt
@@ -16,9 +16,12 @@
 
 package androidx.compose.ui.graphics
 
+@Deprecated("Use direct reference to platform type instead of typealias")
 actual class NativeCanvas
 
 internal actual fun ActualCanvas(image: ImageBitmap): Canvas = implementedInJetBrainsFork()
 
+@Suppress("DEPRECATION")
+@Deprecated("Use platform-specific extension to get platform reference")
 actual val Canvas.nativeCanvas: NativeCanvas
     get() = implementedInJetBrainsFork()
diff --git a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/AndroidParagraph.android.kt b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/AndroidParagraph.android.kt
@@ -33,9 +33,9 @@ import androidx.compose.ui.graphics.Canvas
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.graphics.Shadow
+import androidx.compose.ui.graphics.asAndroidCanvas
 import androidx.compose.ui.graphics.asComposePath
 import androidx.compose.ui.graphics.drawscope.DrawStyle
-import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.graphics.toAndroidRectF
 import androidx.compose.ui.graphics.toComposeRect
 import androidx.compose.ui.text.android.InternalPlatformTextApi
@@ -579,7 +579,7 @@ internal class AndroidParagraph(
     }
 
     private fun paint(canvas: Canvas) {
-        val nativeCanvas = canvas.nativeCanvas
+        val nativeCanvas = canvas.asAndroidCanvas()
         if (didExceedMaxLines) {
             nativeCanvas.save()
             nativeCanvas.clipRect(0f, 0f, width, height)
diff --git a/compose/ui/ui/samples/src/main/java/androidx/compose/ui/samples/AndroidViewSample.kt b/compose/ui/ui/samples/src/main/java/androidx/compose/ui/samples/AndroidViewSample.kt
@@ -40,8 +40,8 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asAndroidCanvas
 import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
-import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
@@ -136,7 +136,7 @@ fun AndroidDrawableInDrawScopeSample() {
                 drawIntoCanvas { canvas ->
                     drawable?.let {
                         it.setBounds(0, 0, size.width.roundToInt(), size.height.roundToInt())
-                        it.draw(canvas.nativeCanvas)
+                        it.draw(canvas.asAndroidCanvas())
                     }
                 }
             }
diff --git a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.android.kt b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/RenderNodeLayer.android.kt
diff --git a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/ViewLayerContainer.android.kt b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/platform/ViewLayerContainer.android.kt
diff --git a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/spatial/RectListDebugger.android.kt b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/spatial/RectListDebugger.android.kt
diff --git a/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/viewinterop/AndroidViewHolder.android.kt b/compose/ui/ui/src/androidMain/kotlin/androidx/compose/ui/viewinterop/AndroidViewHolder.android.kt

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,9 @@ import androidx.compose.ui.draw.drawBehind`
`50`	`50`	`import androidx.compose.ui.draw.paint`
`51`	`51`	`import androidx.compose.ui.graphics.Color`
`52`	`52`	`import androidx.compose.ui.graphics.ColorFilter`
	`53`	`+import androidx.compose.ui.graphics.asAndroidCanvas`
`53`	`54`	`import androidx.compose.ui.graphics.drawscope.drawIntoCanvas`
`54`	`55`	`import androidx.compose.ui.graphics.isUnspecified`
`55`		`-import androidx.compose.ui.graphics.nativeCanvas`
`56`	`56`	`import androidx.compose.ui.layout.ContentScale`
`57`	`57`	`import androidx.compose.ui.layout.LayoutCoordinates`
`58`	`58`	`import androidx.compose.ui.platform.LocalContext`
`@@ -277,7 +277,7 @@ private object TextContextMenuHelperApi28 {`
`277`	`277`	`Modifier.size(ContextMenuSpec.IconSize).drawBehind {`
`278`	`278`	`drawIntoCanvas { canvas ->`
`279`	`279`	`drawable.setBounds(0, 0, size.width.toInt(), size.height.toInt())`
`280`		`- drawable.draw(canvas.nativeCanvas)`
	`280`	`+ drawable.draw(canvas.asAndroidCanvas())`
`281`	`281`	`}`
`282`	`282`	`}`
`283`	`283`	`)`
Original file line number	Diff line number	Diff line change
`@@ -628,7 +628,7 @@ class AndroidCanvasTest {`
`628`	`628`	`val androidCanvas = Canvas(canvas)`
`629`	`629`	`androidCanvas.enableZ()`
`630`	`630`	`for (i in 0 until childCount) {`
`631`		`- drawChild(androidCanvas.nativeCanvas, getChildAt(i), drawingTime)`
	`631`	`+ drawChild(androidCanvas.asAndroidCanvas(), getChildAt(i), drawingTime)`
`632`	`632`	`}`
`633`	`633`	`androidCanvas.disableZ()`
`634`	`634`	`drawLatch.countDown()`