clean-up and docs

Author: yjbanov

lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paint.dart

@@ -11,18 +11,24 @@ import 'package:ui/ui.dart' as ui;
 class SkwasmPaint implements ui.Paint {
   SkwasmPaint();
 
-  // TODO(yjbanov): turns this into a stack-allocated callback-based API.
+  /// Creates the C++ side paint object based on the current state of this
+  /// paint object, and returns it with ownership.
+  ///
+  /// It is the responsibility of the caller to dispose of the returned handle
+  /// when it's no longer needed.
   PaintHandle toRawPaint() {
-    final rawPaint = paintCreate();
-    paintSetAntiAlias(rawPaint, isAntiAlias);
-    paintSetBlendMode(rawPaint, blendMode.index);
-    paintSetStyle(rawPaint, style.index);
-    paintSetStrokeWidth(rawPaint, strokeWidth);
-    paintSetStrokeCap(rawPaint, strokeCap.index);
-    paintSetStrokeJoin(rawPaint, strokeJoin.index);
-    paintSetColorInt(rawPaint, _colorValue);
-    paintSetMiterLimit(rawPaint, strokeMiterLimit);
-    _setEffectiveColorFilter(rawPaint);
+    final rawPaint = paintCreate(
+      isAntiAlias,
+      blendMode.index,
+      _colorValue,
+      style.index,
+      strokeWidth,
+      strokeCap.index,
+      strokeJoin.index,
+      strokeMiterLimit,
+    );
+
+    _maybeSetEffectiveColorFilter(rawPaint);
 
     final shaderHandle = _shader?.handle;
     if (shaderHandle != null) {
@@ -46,12 +52,18 @@ class SkwasmPaint implements ui.Paint {
     return rawPaint;
   }
 
-  void _setEffectiveColorFilter(Pointer<RawPaint> handle) {
-    final SkwasmColorFilter? nativeFilter = _colorFilter != null
-      ? SkwasmColorFilter.fromEngineColorFilter(_colorFilter!) : null;
+  /// If `invertColors` is true or `colorFilter` is not null, sets the
+  /// appropriate Skia color filter. Otherwise, does nothing.
+  void _maybeSetEffectiveColorFilter(Pointer<RawPaint> handle) {
+    final nativeFilter = _colorFilter != null
+      ? SkwasmColorFilter.fromEngineColorFilter(_colorFilter!)
+      : null;
     if (invertColors) {
       if (nativeFilter != null) {
-        final SkwasmColorFilter composedFilter = SkwasmColorFilter.composed(_invertColorFilter, nativeFilter);
+        final composedFilter = SkwasmColorFilter.composed(
+          _invertColorFilter,
+          nativeFilter,
+        );
         nativeFilter.dispose();
         paintSetColorFilter(handle, composedFilter.handle);
         composedFilter.dispose();
@@ -61,8 +73,6 @@ class SkwasmPaint implements ui.Paint {
     } else if (nativeFilter != null) {
       paintSetColorFilter(handle, nativeFilter.handle);
       nativeFilter.dispose();
-    } else {
-      paintSetColorFilter(handle, nullptr);
     }
   }
 

lib/web_ui/lib/src/engine/skwasm/skwasm_impl/raw/raw_paint.dart

@@ -13,57 +13,32 @@ final class RawPaint extends Opaque {}
 
 typedef PaintHandle = Pointer<RawPaint>;
 
-@Native<PaintHandle Function()>(symbol: 'paint_create', isLeaf: true)
-external PaintHandle paintCreate();
+typedef _PaintCreateInitSignature = PaintHandle Function(
+  Bool,
+  Int,
+  Int,
+  Int,
+  Float,
+  Int,
+  Int,
+  Float,
+);
+
+@Native<_PaintCreateInitSignature>(symbol: 'paint_create', isLeaf: true)
+external PaintHandle paintCreate(
+  bool isAntiAlias,
+  int blendMode,
+  int color,
+  int style,
+  double strokeWidth,
+  int strokeCap,
+  int strokeJoin,
+  double strokeMiterLimit,
+);
 
 @Native<Void Function(PaintHandle)>(symbol: 'paint_dispose', isLeaf: true)
 external void paintDispose(PaintHandle paint);
 
-@Native<Void Function(PaintHandle, Int)>(symbol: 'paint_setBlendMode', isLeaf: true)
-external void paintSetBlendMode(PaintHandle paint, int blendMode);
-
-@Native<Void Function(PaintHandle, Int)>(symbol: 'paint_setStyle', isLeaf: true)
-external void paintSetStyle(PaintHandle paint, int paintStyle);
-
-@Native<Int Function(PaintHandle)>(symbol: 'paint_getStyle', isLeaf: true)
-external int paintGetStyle(PaintHandle paint);
-
-@Native<Void Function(PaintHandle, Float)>(symbol: 'paint_setStrokeWidth', isLeaf: true)
-external void paintSetStrokeWidth(PaintHandle paint, double strokeWidth);
-
-@Native<Float Function(PaintHandle)>(symbol: 'paint_getStrokeWidth', isLeaf: true)
-external double paintGetStrokeWidth(PaintHandle paint);
-
-@Native<Void Function(PaintHandle, Int)>(symbol: 'paint_setStrokeCap', isLeaf: true)
-external void paintSetStrokeCap(PaintHandle paint, int cap);
-
-@Native<Int Function(PaintHandle)>(symbol: 'paint_getStrokeCap', isLeaf: true)
-external int paintGetStrokeCap(PaintHandle paint);
-
-@Native<Void Function(PaintHandle, Int)>(symbol: 'paint_setStrokeJoin', isLeaf: true)
-external void paintSetStrokeJoin(PaintHandle paint, int join);
-
-@Native<Int Function(PaintHandle)>(symbol: 'paint_getStrokeJoin', isLeaf: true)
-external int paintGetStrokeJoin(PaintHandle paint);
-
-@Native<Void Function(PaintHandle, Bool)>(symbol: 'paint_setAntiAlias', isLeaf: true)
-external void paintSetAntiAlias(PaintHandle paint, bool antiAlias);
-
-@Native<Bool Function(PaintHandle)>(symbol: 'paint_getAntiAlias', isLeaf: true)
-external bool paintGetAntiAlias(PaintHandle paint);
-
-@Native<Void Function(PaintHandle, Uint32)>(symbol: 'paint_setColorInt', isLeaf: true)
-external void paintSetColorInt(PaintHandle paint, int color);
-
-@Native<Uint32 Function(PaintHandle)>(symbol: 'paint_getColorInt', isLeaf: true)
-external int paintGetColorInt(PaintHandle paint);
-
-@Native<Void Function(PaintHandle, Float)>(symbol: 'paint_setMiterLimit', isLeaf: true)
-external void paintSetMiterLimit(PaintHandle paint, double miterLimit);
-
-@Native<Float Function(PaintHandle)>(symbol: 'paint_getMiterLimit', isLeaf: true)
-external double paintGetMiterLimit(PaintHandle paint);
-
 @Native<Void Function(PaintHandle, ShaderHandle)>(symbol: 'paint_setShader', isLeaf: true)
 external void paintSetShader(PaintHandle handle, ShaderHandle shader);
 

lib/web_ui/skwasm/paint.cpp

@@ -12,80 +12,32 @@
 
 using namespace Skwasm;
 
-SKWASM_EXPORT SkPaint* paint_create() {
+SKWASM_EXPORT SkPaint* paint_create(
+  bool isAntiAlias,
+  SkBlendMode blendMode,
+  SkColor color,
+  SkPaint::Style style,
+  SkScalar strokeWidth,
+  SkPaint::Cap strokeCap,
+  SkPaint::Join strokeJoin,
+  SkScalar strokeMiterLimit
+) {
   auto paint = new SkPaint();
-
-  // Antialias defaults to true in flutter.
-  paint->setAntiAlias(true);
+  paint->setAntiAlias(isAntiAlias);
+  paint->setBlendMode(blendMode);
+  paint->setStyle(style);
+  paint->setStrokeWidth(strokeWidth);
+  paint->setStrokeCap(strokeCap);
+  paint->setStrokeJoin(strokeJoin);
+  paint->setColor(color);
+  paint->setStrokeMiter(strokeMiterLimit);
   return paint;
 }
 
 SKWASM_EXPORT void paint_dispose(SkPaint* paint) {
   delete paint;
 }
 
-SKWASM_EXPORT void paint_setBlendMode(SkPaint* paint, SkBlendMode mode) {
-  paint->setBlendMode(mode);
-}
-
-// No getter for blend mode, as it's non trivial. Cache on the dart side.
-
-SKWASM_EXPORT void paint_setStyle(SkPaint* paint, SkPaint::Style style) {
-  paint->setStyle(style);
-}
-
-SKWASM_EXPORT SkPaint::Style paint_getStyle(SkPaint* paint) {
-  return paint->getStyle();
-}
-
-SKWASM_EXPORT void paint_setStrokeWidth(SkPaint* paint, SkScalar width) {
-  paint->setStrokeWidth(width);
-}
-
-SKWASM_EXPORT SkScalar paint_getStrokeWidth(SkPaint* paint) {
-  return paint->getStrokeWidth();
-}
-
-SKWASM_EXPORT void paint_setStrokeCap(SkPaint* paint, SkPaint::Cap cap) {
-  paint->setStrokeCap(cap);
-}
-
-SKWASM_EXPORT SkPaint::Cap paint_getStrokeCap(SkPaint* paint) {
-  return paint->getStrokeCap();
-}
-
-SKWASM_EXPORT void paint_setStrokeJoin(SkPaint* paint, SkPaint::Join join) {
-  paint->setStrokeJoin(join);
-}
-
-SKWASM_EXPORT SkPaint::Join paint_getStrokeJoin(SkPaint* paint) {
-  return paint->getStrokeJoin();
-}
-
-SKWASM_EXPORT void paint_setAntiAlias(SkPaint* paint, bool antiAlias) {
-  paint->setAntiAlias(antiAlias);
-}
-
-SKWASM_EXPORT bool paint_getAntiAlias(SkPaint* paint) {
-  return paint->isAntiAlias();
-}
-
-SKWASM_EXPORT void paint_setColorInt(SkPaint* paint, SkColor colorInt) {
-  paint->setColor(colorInt);
-}
-
-SKWASM_EXPORT SkColor paint_getColorInt(SkPaint* paint) {
-  return paint->getColor();
-}
-
-SKWASM_EXPORT void paint_setMiterLimit(SkPaint* paint, SkScalar miterLimit) {
-  paint->setStrokeMiter(miterLimit);
-}
-
-SKWASM_EXPORT SkScalar paint_getMiterLimit(SkPaint* paint) {
-  return paint->getStrokeMiter();
-}
-
 SKWASM_EXPORT void paint_setShader(SkPaint* paint, SkShader* shader) {
   paint->setShader(sk_ref_sp<SkShader>(shader));
 }