@shopify/react-native-skia 1.1.0 → 1.2.0

package/src/skia/types/Skia.ts

@@ -30,6 +30,7 @@ import type { Color, SkColor } from "./Color";
 import type { TypefaceFontProviderFactory } from "./Paragraph/TypefaceFontProviderFactory";
 import type { AnimatedImageFactory } from "./AnimatedImage";
 import type { ParagraphBuilderFactory } from "./Paragraph/ParagraphBuilder";
+import type { PlatformBufferFactory } from "./PlatformBuffer";
 
 /**
  * Declares the interface for the native Skia API
@@ -93,6 +94,6 @@ export interface Skia {
   SVG: SVGFactory;
   TextBlob: TextBlobFactory;
   Surface: SurfaceFactory;
-  // Paragraph
   ParagraphBuilder: ParagraphBuilderFactory;
+  PlatformBuffer: PlatformBufferFactory;
 }

package/src/skia/types/Surface/Surface.ts

@@ -29,4 +29,14 @@ export interface SkSurface extends SkJSIInstance<"Surface"> {
    * Make sure any queued draws are sent to the screen or the GPU.
    */
   flush(): void;
+
+  /**
+   * Returns the possibly scaled width of the surface.
+   */
+  width(): number;
+
+  /**
+   * Returns the possibly scaled height of the surface.
+   */
+  height(): number;
 }

package/src/skia/types/index.ts

@@ -29,3 +29,4 @@ export * from "./TextBlob";
 export * from "./Size";
 export * from "./Paragraph";
 export * from "./Matrix4";
+export * from "./PlatformBuffer";

package/src/skia/web/JsiSkImage.ts

@@ -45,11 +45,7 @@ export const toBase64String = (bytes: Uint8Array) => {
 };
 
 export class JsiSkImage extends HostObject<Image, "Image"> implements SkImage {
-  constructor(
-    CanvasKit: CanvasKit,
-    ref: Image,
-    private releaseCtx?: () => void
-  ) {
+  constructor(CanvasKit: CanvasKit, ref: Image) {
     super(CanvasKit, ref, "Image");
   }
 
@@ -154,37 +150,24 @@ export class JsiSkImage extends HostObject<Image, "Image"> implements SkImage {
 
   dispose = () => {
     this.ref.delete();
-    if (this.releaseCtx) {
-      this.releaseCtx();
-    }
   };
 
   makeNonTextureImage(): SkImage {
+    // if the image is already a non-texture image, this is a no-op
     const partialInfo = this.ref.getImageInfo();
     const colorSpace = this.ref.getColorSpace();
     const info = {
       ...partialInfo,
       colorSpace,
     };
-
-    var pixelLen = info.width * info.height * 4;
-    const pixelPtr = this.CanvasKit.Malloc(Uint8Array, pixelLen);
-    const pixels = this.ref.readPixels(
-      0,
-      0,
-      info,
-      pixelPtr,
-      info.width * 4
-    ) as Uint8Array | null;
+    const pixels = this.ref.readPixels(0, 0, info) as Uint8Array | null;
     if (!pixels) {
-      throw new Error("Could not create image from bytes");
+      throw new Error("Could not read pixels from image");
     }
     const img = this.CanvasKit.MakeImage(info, pixels, info.width * 4);
     if (!img) {
       throw new Error("Could not create image from bytes");
     }
-    return new JsiSkImage(this.CanvasKit, img, () => {
-      this.CanvasKit.Free(pixelPtr);
-    });
+    return new JsiSkImage(this.CanvasKit, img);
   }
 }

package/src/skia/web/JsiSkImageFactory.ts

@@ -1,7 +1,12 @@
 import type { CanvasKit } from "canvaskit-wasm";
 
-import type { SkData, ImageInfo, SkImage } from "../types";
-import type { ImageFactory } from "../types/Image/ImageFactory";
+import type {
+  SkData,
+  ImageInfo,
+  SkImage,
+  PlatformBuffer,
+  ImageFactory,
+} from "../types";
 
 import { Host, getEnum } from "./Host";
 import { JsiSkImage } from "./JsiSkImage";
@@ -19,6 +24,12 @@ export class JsiSkImageFactory extends Host implements ImageFactory {
     return Promise.resolve(null);
   }
 
+  MakeImageFromPlatformBuffer(_platformBuffer: PlatformBuffer): SkImage {
+    throw new Error(
+      "MakeImageFromPlatformBuffer() is only available on iOS and Android!"
+    );
+  }
+
   MakeImageFromEncoded(encoded: SkData) {
     const image = this.CanvasKit.MakeImageFromEncoded(
       JsiSkData.fromValue(encoded)

package/src/skia/web/JsiSkPlatformBufferFactory.ts

@@ -0,0 +1,22 @@
+import type { CanvasKit } from "canvaskit-wasm";
+
+import type { PlatformBuffer, PlatformBufferFactory, SkImage } from "../types";
+
+import { Host, NotImplementedOnRNWeb } from "./Host";
+
+export class JsiSkPlatformBufferFactory
+  extends Host
+  implements PlatformBufferFactory
+{
+  constructor(CanvasKit: CanvasKit) {
+    super(CanvasKit);
+  }
+
+  MakeFromImage(_image: SkImage): PlatformBuffer {
+    throw new NotImplementedOnRNWeb();
+  }
+
+  Release(_platformBuffer: PlatformBuffer) {
+    throw new NotImplementedOnRNWeb();
+  }
+}

package/src/skia/web/JsiSkSurface.ts

@@ -11,25 +11,26 @@ export class JsiSkSurface
   extends HostObject<Surface, "Surface">
   implements SkSurface
 {
-  constructor(
-    CanvasKit: CanvasKit,
-    ref: Surface,
-    private releaseCtx?: () => void
-  ) {
+  constructor(CanvasKit: CanvasKit, ref: Surface) {
     super(CanvasKit, ref, "Surface");
   }
 
   dispose = () => {
-    this.ref.delete();
-    if (this.releaseCtx) {
-      this.releaseCtx();
-    }
+    this.ref.dispose();
   };
 
   flush() {
     this.ref.flush();
   }
 
+  width() {
+    return this.ref.width();
+  }
+
+  height() {
+    return this.ref.height();
+  }
+
   getCanvas(): SkCanvas {
     return new JsiSkCanvas(this.CanvasKit, this.ref.getCanvas());
   }

package/src/skia/web/JsiSkSurfaceFactory.ts

@@ -11,26 +11,10 @@ export class JsiSkSurfaceFactory extends Host implements SurfaceFactory {
   }
 
   Make(width: number, height: number) {
-    var pixelLen = width * height * 4;
-    const pixelPtr = this.CanvasKit.Malloc(Uint8Array, pixelLen);
-    const surface = this.CanvasKit.MakeRasterDirectSurface(
-      {
-        width: width,
-        height: height,
-        colorType: this.CanvasKit.ColorType.RGBA_8888,
-        alphaType: this.CanvasKit.AlphaType.Unpremul,
-        colorSpace: this.CanvasKit.ColorSpace.SRGB,
-      },
-      pixelPtr,
-      width * 4
+    return new JsiSkSurface(
+      this.CanvasKit,
+      this.CanvasKit.MakeSurface(width, height)!
     );
-    if (!surface) {
-      return null;
-    }
-    surface.getCanvas().clear(this.CanvasKit.TRANSPARENT);
-    return new JsiSkSurface(this.CanvasKit, surface, () => {
-      this.CanvasKit.Free(pixelPtr);
-    });
   }
 
   MakeOffscreen(width: number, height: number) {

package/src/skia/web/JsiSkia.ts

@@ -41,6 +41,7 @@ import { JsiSkTypefaceFontProviderFactory } from "./JsiSkTypefaceFontProviderFac
 import { JsiSkFontMgrFactory } from "./JsiSkFontMgrFactory";
 import { JsiSkAnimatedImageFactory } from "./JsiSkAnimatedImageFactory";
 import { JsiSkParagraphBuilderFactory } from "./JsiSkParagraphBuilderFactory";
+import { JsiSkPlatformBufferFactory } from "./JsiSkPlatformBufferFactory";
 
 export const JsiSkApi = (CanvasKit: CanvasKit): Skia => ({
   Point: (x: number, y: number) =>
@@ -125,4 +126,5 @@ export const JsiSkApi = (CanvasKit: CanvasKit): Skia => ({
   TypefaceFontProvider: new JsiSkTypefaceFontProviderFactory(CanvasKit),
   FontMgr: new JsiSkFontMgrFactory(CanvasKit),
   ParagraphBuilder: new JsiSkParagraphBuilderFactory(CanvasKit),
+  PlatformBuffer: new JsiSkPlatformBufferFactory(CanvasKit),
 });

package/cpp/skia/include/third_party/vulkan/LICENSE

@@ -1,29 +0,0 @@
-// Copyright (c) 2018 Google Inc. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------------------------------------

package/cpp/skia/modules/skcms/README.chromium

@@ -1,6 +0,0 @@
-Name: skcms
-URL: https://skia.org/
-Version: unknown
-Security Critical: yes
-Shipped: yes
-License: BSD

package/cpp/skia/readme.txt

@@ -1 +0,0 @@
-Placeholder for the Skia include files.