refactor: Enhance parameter passing and const correctness in canvas drawing functions

Author: sebuntin

compose/ui/ui-arkui/src/ohosArm64Main/cpp/compose/src/main/cpp/compose/arkui_utils_export.cpp

@@ -22,8 +22,6 @@
 #include "xcomponent_holder.h"
 #include "xcomponent_log.h"
 #include "xcomponent_render.h"
-#include "canvas/oh_native_canvas_proxy.h"
-#include "canvas/oh_native_canvas_proxy_factory.h"
 
 EXTERN_C_START
 void androidx_compose_ui_arkui_utils_init(napi_env env, napi_value exports) {

compose/ui/ui-arkui/src/ohosArm64Main/cpp/compose/src/main/cpp/compose/canvas/oh_compose_native_paint.h

@@ -1,12 +1,12 @@
 #ifndef ANDROIDX_COMPOSE_UI_ARKUI_UTILS_OHCOMPOSENATIVEPATIN_H
 #define ANDROIDX_COMPOSE_UI_ARKUI_UTILS_OHCOMPOSENATIVEPATIN_H
 
-#include <cstdint>
 #include <native_drawing/drawing_types.h>
+#include <cstdint>
+
 #include "../constants/oh_native_enums.h"
 #include "../shader/oh_native_basic_shader.h"
 
-
 namespace androidx::compose::ui::arkui::utils {
 class OHComposeNativePaint {
 public:
@@ -43,13 +43,13 @@ class OHComposeNativePaint {
     bool isAntiAlias{};
 
     // kt侧设置的 shader
-    OH::NativeBasicShader* shader{};
+    OH::NativeBasicShader *shader{};
 
     // kt侧设置的 pathEffect
-    OH_Drawing_PathEffect* pathEffect{};
+    OH_Drawing_PathEffect *pathEffect{};
 
     // kt侧设置的 颜色 filter，通常是 OHGaussianBlurFilter
-    OH_Drawing_ColorFilter* colorFilter{};
+    OH_Drawing_ColorFilter *colorFilter{};
 };
 } // namespace androidx::compose::ui::arkui::utils
 

compose/ui/ui-arkui/src/ohosArm64Main/cpp/compose/src/main/cpp/compose/canvas/oh_native_canvas_export.cpp

@@ -1,6 +1,6 @@
 /*
- * Tencent is pleased to support the open source community by making ovCompose available.
- * Copyright (C) 2025 Tencent. All rights reserved.
+ * Tencent is pleased to support the open source community by making ovCompose
+ * available. Copyright (C) 2025 Tencent. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-#include "napi/native_api.h"
-#include "../constants/oh_native_enums.h"
+#include <napi/native_api.h>
+#include <native_drawing/drawing_types.h>
+
 #include "../constants/oh_native_constants.h"
-#include "native_drawing/drawing_types.h"
-#include <arkui/native_render.h>
 
 #ifndef ANDROIDX_COMPOSE_UI_ARKUI_UTILS_OHNATIVECANVAS_EXPORT_H
 #define ANDROIDX_COMPOSE_UI_ARKUI_UTILS_OHNATIVECANVAS_EXPORT_H
@@ -34,47 +33,82 @@ void androidx_compose_ui_arkui_utils_DisposeOHComposeNativePaint(OHComposeNative
 // OHNativeCanvasProxy state operations
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_save(OHNativeCanvasProxy_Handle proxy);
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_restore(OHNativeCanvasProxy_Handle proxy);
-void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_translate(OHNativeCanvasProxy_Handle proxy, float dx, float dy);
-void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_setBounds(OHNativeCanvasProxy_Handle proxy, int32_t originX, int32_t originY, int32_t boundsWidth, int32_t boundsHeight);
-void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_setPosition(OHNativeCanvasProxy_Handle proxy, int32_t x, int32_t y);
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_translate(OHNativeCanvasProxy_Handle proxy, float dx,
+                                                                   float dy);
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_setBounds(OHNativeCanvasProxy_Handle proxy, int32_t originX,
+                                                                   int32_t originY, int32_t boundsWidth,
+                                                                   int32_t boundsHeight);
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_setPosition(OHNativeCanvasProxy_Handle proxy, int32_t x,
+                                                                     int32_t y);
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_setPivot(OHNativeCanvasProxy_Handle proxy, float px, float py);
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_setOpacity(OHNativeCanvasProxy_Handle proxy, float alpha);
 
 // OHNativeCanvasProxy drawCommand
-void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawRect(OHNativeCanvasProxy_Handle proxy, float left, float top, float right, float bottom, OHComposeNativePaint_Handle paint);
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawRect(OHNativeCanvasProxy_Handle proxy, float left,
+                                                                  float top, float right, float bottom,
+                                                                  OHComposeNativePaint_Handle paint);
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_finishDraw(OHNativeCanvasProxy_Handle proxy);
-void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLayer(OHNativeCanvasProxy_Handle proxy, BaseRenderNode_Handle renderNodeHandle);
-void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawParagraph(OHNativeCanvasProxy_Handle proxy, BaseRenderNode_Handle paragraphHandle);
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLayer(OHNativeCanvasProxy_Handle proxy,
+                                                                   BaseRenderNode_Handle renderNodeHandle);
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawParagraph(OHNativeCanvasProxy_Handle proxy,
+                                                                       BaseRenderNode_Handle paragraphHandle);
 void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_attachToRootView(OHNativeCanvasProxy_Handle proxy);
-void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_setParent(OHNativeCanvasProxy_Handle proxy, OHNativeCanvasProxy_Handle parentProxy);
-void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLine(OHNativeCanvasProxy_Handle proxy, float x1, float y1, float x2, float y2, OHComposeNativePaint_Handle paint);
-void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLayerWithSubproxy(OHNativeCanvasProxy_Handle proxy, OHNativeCanvasProxy_Handle subProxy);
-void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_clipRect(OHNativeCanvasProxy_Handle proxy, float left, float top, float right, float bottom, uint32_t clipOp);
-void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawRoundRect(OHNativeCanvasProxy_Handle proxy, float left, float top, float right, float bottom, float radiusX, float radiusY, OHComposeNativePaint_Handle paint);
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_setParent(OHNativeCanvasProxy_Handle proxy,
+                                                                   OHNativeCanvasProxy_Handle parentProxy);
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLine(OHNativeCanvasProxy_Handle proxy, float x1, float y1,
+                                                                  float x2, float y2,
+                                                                  OHComposeNativePaint_Handle paint);
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawLayerWithSubproxy(OHNativeCanvasProxy_Handle proxy,
+                                                                               OHNativeCanvasProxy_Handle subProxy);
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_clipRect(OHNativeCanvasProxy_Handle proxy, float left,
+                                                                  float top, float right, float bottom,
+                                                                  uint32_t clipOp);
+void androidx_compose_ui_arkui_utils_OHNativeCanvasProxy_drawRoundRect(OHNativeCanvasProxy_Handle proxy, float left,
+                                                                       float top, float right, float bottom,
+                                                                       float radiusX, float radiusY,
+                                                                       OHComposeNativePaint_Handle paint);
 
 // OHComposeNativePaint set paint properties
 void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setAlpha(OHComposeNativePaint_Handle paint, float alpha);
-void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setIsAntiAlias(OHComposeNativePaint_Handle paint, bool isAntiAlias);
+void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setIsAntiAlias(OHComposeNativePaint_Handle paint,
+                                                                         bool isAntiAlias);
 void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setColor(OHComposeNativePaint_Handle paint, uint64_t color);
-void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setStrokeWidth(OHComposeNativePaint_Handle paint, float strokeWidth);
-void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setBlendMode(OHComposeNativePaint_Handle paint, uint32_t blendMode);
+void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setStrokeWidth(OHComposeNativePaint_Handle paint,
+                                                                         float strokeWidth);
+void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setBlendMode(OHComposeNativePaint_Handle paint,
+                                                                       uint32_t blendMode);
 void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setStyle(OHComposeNativePaint_Handle paint, uint32_t style);
-void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setStrokeCap(OHComposeNativePaint_Handle paint, uint32_t strokeCap);
-void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setStrokeJoin(OHComposeNativePaint_Handle paint, uint32_t strokeJoin);
-void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setStrokeMiterLimit(OHComposeNativePaint_Handle paint, float miterLimit);
-void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setFilterQuality(OHComposeNativePaint_Handle paint, uint32_t quality);
-void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setShader(OHComposeNativePaint_Handle paint, NativeBasicShader_Handle shader);
-void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setPathEffect(OHComposeNativePaint_Handle paint, OH_Drawing_PathEffect_Handle pathEffect);
-void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setColorFilter(OHComposeNativePaint_Handle paint, OH_Drawing_ColorFilter_Handle colorFilter);
+void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setStrokeCap(OHComposeNativePaint_Handle paint,
+                                                                       uint32_t strokeCap);
+void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setStrokeJoin(OHComposeNativePaint_Handle paint,
+                                                                        uint32_t strokeJoin);
+void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setStrokeMiterLimit(OHComposeNativePaint_Handle paint,
+                                                                              float miterLimit);
+void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setFilterQuality(OHComposeNativePaint_Handle paint,
+                                                                           uint32_t quality);
+void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setShader(OHComposeNativePaint_Handle paint,
+                                                                    NativeBasicShader_Handle shader);
+void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setPathEffect(OHComposeNativePaint_Handle paint,
+                                                                        OH_Drawing_PathEffect_Handle pathEffect);
+void androidx_compose_ui_arkui_utils_OHComposeNativePaint_setColorFilter(OHComposeNativePaint_Handle paint,
+                                                                         OH_Drawing_ColorFilter_Handle colorFilter);
 
 // NativeShader related methods
-NativeBasicShader_Handle androidx_compose_ui_arkui_utils_createNativeLinearGradientShader(float startX, float startY, float endX, float endY,
-                                                                                          uint32_t *colors, float *colorPositions, uint32_t colorCount, uint32_t tileMode);
-NativeBasicShader_Handle androidx_compose_ui_arkui_utils_createNativeRadialGradientShader(float centerX, float centerY, float radius,
-                                                                                          uint32_t *colors, float *colorPositions, uint32_t colorCount, uint32_t tileMode);
+NativeBasicShader_Handle
+androidx_compose_ui_arkui_utils_createNativeLinearGradientShader(float startX, float startY, float endX, float endY,
+                                                                 uint32_t *colors, float *colorPositions,
+                                                                 uint32_t colorCount, uint32_t tileMode);
+NativeBasicShader_Handle
+androidx_compose_ui_arkui_utils_createNativeRadialGradientShader(float centerX, float centerY, float radius,
+                                                                 uint32_t *colors, float *colorPositions,
+                                                                 uint32_t colorCount, uint32_t tileMode);
 NativeBasicShader_Handle androidx_compose_ui_arkui_utils_createNativeSweepGradientShader(float centerX, float centerY,
-                                                                                         uint32_t *colors, float *colorPositions, uint32_t colorCount);
-NativeBasicShader_Handle androidx_compose_ui_arkui_utils_createNativeImageShader(OH_Drawing_Image* image, uint32_t tileModeX, uint32_t tileModeY);
+                                                                                         uint32_t *colors,
+                                                                                         float *colorPositions,
+                                                                                         uint32_t colorCount);
+NativeBasicShader_Handle androidx_compose_ui_arkui_utils_createNativeImageShader(OH_Drawing_Image *image,
+                                                                                 uint32_t tileModeX,
+                                                                                 uint32_t tileModeY);
 EXTERN_C_END
 
 #endif