@shopify/react-native-skia 0.1.194 → 0.1.196

package/android/CMakeLists.txt

@@ -51,6 +51,7 @@ add_library(
         "${PROJECT_SOURCE_DIR}/cpp/jsi/JsiValue.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/jsi/RuntimeLifecycleMonitor.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/jsi/RuntimeAwareCache.cpp"        
+        "${PROJECT_SOURCE_DIR}/cpp/jsi/JsiPromises.cpp"
 
         "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkManager.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/rnskia/RNSkJsView.cpp"

package/android/build.gradle

@@ -137,6 +137,12 @@ android {
         abortOnError false
     }
 
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
+    }
+
     externalNativeBuild {
         cmake {
             path file('CMakeLists.txt')
@@ -223,12 +229,6 @@ dependencies {
 }
 
 afterEvaluate { project ->
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-        include '**/*.java'
-    }
-
     android.libraryVariants.all { variant ->
         def name = variant.name.capitalize()
         def javaCompileTask = variant.javaCompileProvider.get()
@@ -237,10 +237,6 @@ afterEvaluate { project ->
             from javaCompileTask.destinationDir
         }
     }
-
-    artifacts {
-        archives androidSourcesJar
-    }
 }
 
 task extractAARHeaders {
@@ -278,7 +274,6 @@ if (ENABLE_PREFAB) {
         into "${project.buildDir}/headers/rnskia/"
         includeEmptyDirs = false
         include "**/*.h"
-        duplicatesStrategy = 'include'
         eachFile {
             String path = it.path
 

package/android/cpp/rnskia-android/RNSkAndroidView.h

@@ -42,6 +42,10 @@ public:
   void surfaceAvailable(jobject surface, int width, int height) override {
     std::static_pointer_cast<RNSkOpenGLCanvasProvider>(T::getCanvasProvider())
         ->surfaceAvailable(surface, width, height);
+
+    // Try to render directly when the surface has been set so that
+    // we don't have to wait until the draw loop returns.
+    RNSkView::renderImmediate();
   }
 
   void surfaceDestroyed() override {

package/android/cpp/rnskia-android/RNSkOpenGLCanvasProvider.cpp

@@ -23,11 +23,12 @@ float RNSkOpenGLCanvasProvider::getScaledWidth() { return _width; }
 
 float RNSkOpenGLCanvasProvider::getScaledHeight() { return _height; }
 
-void RNSkOpenGLCanvasProvider::renderToCanvas(
+bool RNSkOpenGLCanvasProvider::renderToCanvas(
     const std::function<void(SkCanvas *)> &cb) {
   if (_renderer != nullptr) {
-    _renderer->run(cb, _width, _height);
+    return _renderer->run(cb, _width, _height);
   }
+  return false;
 }
 
 void RNSkOpenGLCanvasProvider::surfaceAvailable(jobject surface, int width,

package/android/cpp/rnskia-android/RNSkOpenGLCanvasProvider.h

@@ -25,7 +25,7 @@ public:
 
   float getScaledHeight() override;
 
-  void renderToCanvas(const std::function<void(SkCanvas *)> &cb) override;
+  bool renderToCanvas(const std::function<void(SkCanvas *)> &cb) override;
 
   void surfaceAvailable(jobject surface, int width, int height);
 

package/android/cpp/rnskia-android/SkiaOpenGLRenderer.cpp

@@ -4,6 +4,8 @@
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
 
+#define STENCIL_BUFFER_SIZE 8
+
 namespace RNSkia {
 /** Static members */
 sk_sp<SkSurface> MakeOffscreenGLSurface(int width, int height) {
@@ -137,7 +139,7 @@ SkiaOpenGLRenderer::~SkiaOpenGLRenderer() {
   _nativeWindow = nullptr;
 }
 
-void SkiaOpenGLRenderer::run(const std::function<void(SkCanvas *)> &cb,
+bool SkiaOpenGLRenderer::run(const std::function<void(SkCanvas *)> &cb,
                              int width, int height) {
   switch (_renderState) {
   case RenderState::Initializing: {
@@ -148,31 +150,48 @@ void SkiaOpenGLRenderer::run(const std::function<void(SkCanvas *)> &cb,
   case RenderState::Rendering: {
     // Make sure to initialize the rendering pipeline
     if (!ensureInitialised()) {
-      break;
-    }
-
-    // Ensure we have the Skia surface to draw on. We need to
-    // pass width and height since the surface will be recreated
-    // when the view is resized.
-    if (!ensureSkiaSurface(width, height)) {
-      return;
+      return false;
     }
 
     if (cb != nullptr) {
-      // Reset Skia Context since it might be modified by another Skia View
-      // during rendering.
+      // RNSkLogger::logToConsole("SKIARENDER - Render begin");
+
       getThreadDrawingContext()->skContext->resetContext();
 
+      SkColorType colorType;
+      // setup surface for fbo0
+      GrGLFramebufferInfo fboInfo;
+      fboInfo.fFBOID = 0;
+      fboInfo.fFormat = 0x8058;
+      colorType = kN32_SkColorType;
+
+      GrBackendRenderTarget backendRT(width, height, 0, STENCIL_BUFFER_SIZE,
+                                      fboInfo);
+
+      SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
+
+      sk_sp<SkSurface> renderTarget(SkSurface::MakeFromBackendRenderTarget(
+          getThreadDrawingContext()->skContext.get(), backendRT,
+          kBottomLeft_GrSurfaceOrigin, colorType, nullptr, &props));
+
+      auto canvas = renderTarget->getCanvas();
+
       // Draw picture into surface
-      cb(_skSurface->getCanvas());
+      cb(canvas);
+
       // Flush
-      _skSurface->flushAndSubmit();
+      canvas->flush();
 
       if (!eglSwapBuffers(getThreadDrawingContext()->glDisplay, _glSurface)) {
         RNSkLogger::logToConsole("eglSwapBuffers failed: %d\n", eglGetError());
+        return false;
       }
+
+      // RNSkLogger::logToConsole("SKIARENDER - render done");
+      return true;
     }
-    break;
+
+    return false;
   }
   case RenderState::Finishing: {
     _renderState = RenderState::Done;
@@ -184,14 +203,11 @@ void SkiaOpenGLRenderer::run(const std::function<void(SkCanvas *)> &cb,
       _glSurface = EGL_NO_SURFACE;
     }
 
-    // Release Skia Surface
-    _skSurface = nullptr;
-
-    break;
+    return true;
   }
   case RenderState::Done: {
     // Do nothing. We're done.
-    break;
+    return true;
   }
   }
 }
@@ -326,54 +342,4 @@ bool SkiaOpenGLRenderer::initGLSurface() {
 
   return true;
 }
-
-bool SkiaOpenGLRenderer::ensureSkiaSurface(int width, int height) {
-  if (getThreadDrawingContext()->skContext == nullptr) {
-    return false;
-  }
-
-  if (_skSurface == nullptr || !_skRenderTarget.isValid() ||
-      _prevWidth != width || _prevHeight != height) {
-    glViewport(0, 0, width, height);
-
-    _prevWidth = width;
-    _prevHeight = height;
-
-    GLint buffer;
-    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &buffer);
-
-    GLint stencil;
-    glGetIntegerv(GL_STENCIL_BITS, &stencil);
-
-    GLint samples;
-    glGetIntegerv(GL_SAMPLES, &samples);
-
-    auto maxSamples =
-        getThreadDrawingContext()->skContext->maxSurfaceSampleCountForColorType(
-            kRGBA_8888_SkColorType);
-
-    if (samples > maxSamples)
-      samples = maxSamples;
-
-    GrGLFramebufferInfo fbInfo;
-    fbInfo.fFBOID = buffer;
-    fbInfo.fFormat = 0x8058;
-
-    _skRenderTarget =
-        GrBackendRenderTarget(width, height, samples, stencil, fbInfo);
-
-    _skSurface = SkSurface::MakeFromBackendRenderTarget(
-        getThreadDrawingContext()->skContext.get(), _skRenderTarget,
-        kBottomLeft_GrSurfaceOrigin, kRGBA_8888_SkColorType, nullptr, nullptr);
-
-    if (!_skSurface) {
-      RNSkLogger::logToConsole(
-          "JniSkiaDrawView::setupSurface - skSurface could not be created!");
-      return false;
-    }
-
-    return true;
-  }
-  return true;
-}
 } // namespace RNSkia

package/android/cpp/rnskia-android/SkiaOpenGLRenderer.h

@@ -60,7 +60,7 @@ public:
    * @param width Width of surface to render if there is a picture
    * @param height Height of surface to render if there is a picture
    */
-  void run(const std::function<void(SkCanvas *)> &cb, int width, int height);
+  bool run(const std::function<void(SkCanvas *)> &cb, int width, int height);
 
   /**
    * Sets the state to finishing. Next time the renderer will be called it
@@ -102,15 +102,6 @@ private:
    */
   bool initGLSurface();
 
-  /**
-   * Ensures that we have a valid Skia surface to draw to. The surface will
-   * be recreated if the width/height change.
-   * @param width Width of the underlying view
-   * @param height Height of the underlying view
-   * @return True if initialization went well
-   */
-  bool ensureSkiaSurface(int width, int height);
-
   /**
    * To be able to use static contexts (and avoid reloading the skia context for
    * each new view, we track the OpenGL and Skia drawing context per thread.
@@ -121,8 +112,6 @@ private:
   EGLSurface _glSurface = EGL_NO_SURFACE;
 
   ANativeWindow *_nativeWindow = nullptr;
-  GrBackendRenderTarget _skRenderTarget;
-  sk_sp<SkSurface> _skSurface;
 
   int _prevWidth = 0;
   int _prevHeight = 0;

package/cpp/api/JsiSkDataFactory.h

@@ -3,17 +3,15 @@
 #include <memory>
 #include <utility>
 
-#include <ReactCommon/TurboModuleUtils.h>
 #include <jsi/jsi.h>
 
-#include "SkBase64.h"
-
+#include "JsiPromises.h"
 #include "JsiSkData.h"
+#include "SkBase64.h"
 
 namespace RNSkia {
 
 namespace jsi = facebook::jsi;
-namespace react = facebook::react;
 
 class JsiSkDataFactory : public JsiSkHostObject {
 public:
@@ -21,11 +19,11 @@ public:
     auto jsiLocalUri = arguments[0].asString(runtime);
     auto localUri = jsiLocalUri.utf8(runtime);
     auto context = getContext();
-    return react::createPromiseAsJSIValue(
+    return RNJsi::JsiPromises::createPromiseAsJSIValue(
         runtime,
         [context = std::move(context), localUri = std::move(localUri)](
             jsi::Runtime &runtime,
-            std::shared_ptr<react::Promise> promise) -> void {
+            std::shared_ptr<RNJsi::JsiPromises::Promise> promise) -> void {
           // Create a stream operation - this will be run in a
           // separate thread
           context->performStreamOperation(

package/cpp/api/JsiSkImageFactory.h

@@ -5,6 +5,7 @@
 
 #include <jsi/jsi.h>
 
+#include "JsiPromises.h"
 #include "JsiSkData.h"
 #include "JsiSkHostObjects.h"
 #include "JsiSkImage.h"
@@ -41,11 +42,11 @@ public:
   JSI_HOST_FUNCTION(MakeImageFromViewTag) {
     auto viewTag = arguments[0].asNumber();
     auto context = getContext();
-    return react::createPromiseAsJSIValue(
+    return RNJsi::JsiPromises::createPromiseAsJSIValue(
         runtime,
-        [context = std::move(context),
-         viewTag](jsi::Runtime &runtime,
-                  std::shared_ptr<react::Promise> promise) -> void {
+        [context = std::move(context), viewTag](
+            jsi::Runtime &runtime,
+            std::shared_ptr<RNJsi::JsiPromises::Promise> promise) -> void {
           // Create a stream operation - this will be run on the main thread
           context->makeViewScreenshot(
               viewTag, [&runtime, context = std::move(context),

package/cpp/jsi/JsiPromises.cpp

@@ -0,0 +1,39 @@
+#include "JsiPromises.h"
+
+namespace RNJsi {
+
+JsiPromises::Promise::Promise(jsi::Runtime &rt, jsi::Function resolve,
+                              jsi::Function reject)
+    : runtime_(rt), resolve_(std::move(resolve)), reject_(std::move(reject)) {}
+
+void JsiPromises::Promise::resolve(const jsi::Value &result) {
+  resolve_.call(runtime_, result);
+}
+
+void JsiPromises::Promise::reject(const std::string &message) {
+  jsi::Object error(runtime_);
+  error.setProperty(runtime_, "message",
+                    jsi::String::createFromUtf8(runtime_, message));
+  reject_.call(runtime_, error);
+}
+
+jsi::Value
+JsiPromises::createPromiseAsJSIValue(jsi::Runtime &rt,
+                                     PromiseSetupFunctionType &&func) {
+  jsi::Function JSPromise = rt.global().getPropertyAsFunction(rt, "Promise");
+  jsi::Function fn = jsi::Function::createFromHostFunction(
+      rt, jsi::PropNameID::forAscii(rt, "fn"), 2,
+      [func = std::move(func)](jsi::Runtime &rt2, const jsi::Value &thisVal,
+                               const jsi::Value *args, size_t count) {
+        jsi::Function resolve = args[0].getObject(rt2).getFunction(rt2);
+        jsi::Function reject = args[1].getObject(rt2).getFunction(rt2);
+        auto wrapper = std::make_shared<Promise>(rt2, std::move(resolve),
+                                                 std::move(reject));
+        func(rt2, wrapper);
+        return jsi::Value::undefined();
+      });
+
+  return JSPromise.callAsConstructor(rt, fn);
+}
+
+} // namespace RNJsi

package/cpp/jsi/JsiPromises.h

@@ -0,0 +1,50 @@
+#pragma once
+
+#include <memory>
+#include <string>
+#include <utility>
+
+#include <jsi/jsi.h>
+
+#include "SkBase64.h"
+
+namespace RNJsi {
+namespace jsi = facebook::jsi;
+
+/**
+ These classes are taken from ReactCommon TurboModuleUtils. It is no longer (RN
+ 0.72) possible to include and uses TurboModulesUtils without a lot of trouble
+ when use_frameworks are true in POD file. Instead we're now just including the
+ implementations ourselves.
+ */
+
+class LongLivedObject {
+public:
+  void allowRelease();
+
+protected:
+  LongLivedObject() = default;
+  virtual ~LongLivedObject() = default;
+};
+
+class JsiPromises {
+public:
+  struct Promise : public LongLivedObject {
+    Promise(jsi::Runtime &rt, jsi::Function resolve, jsi::Function reject);
+
+    void resolve(const jsi::Value &result);
+    void reject(const std::string &error);
+
+    jsi::Runtime &runtime_;
+    jsi::Function resolve_;
+    jsi::Function reject_;
+  };
+
+  using PromiseSetupFunctionType =
+      std::function<void(jsi::Runtime &rt, std::shared_ptr<Promise>)>;
+
+  static jsi::Value createPromiseAsJSIValue(jsi::Runtime &rt,
+                                            PromiseSetupFunctionType &&func);
+};
+
+} // namespace RNJsi

package/cpp/rnskia/RNSkDomView.cpp

@@ -36,15 +36,16 @@ bool RNSkDomRenderer::tryRender(
 
   // We render on the main thread
   if (_renderLock->try_lock()) {
+    bool result = false;
     // If we have a Dom Node we can render directly on the main thread
     if (_root != nullptr) {
-      canvasProvider->renderToCanvas(std::bind(
+      result = canvasProvider->renderToCanvas(std::bind(
           &RNSkDomRenderer::renderCanvas, this, std::placeholders::_1,
           canvasProvider->getScaledWidth(), canvasProvider->getScaledHeight()));
     }
 
     _renderLock->unlock();
-    return true;
+    return result;
   } else {
     return false;
   }

package/cpp/rnskia/RNSkPictureView.h

@@ -44,8 +44,7 @@ public:
       : RNSkRenderer(requestRedraw), _platformContext(context) {}
 
   bool tryRender(std::shared_ptr<RNSkCanvasProvider> canvasProvider) override {
-    performDraw(canvasProvider);
-    return true;
+    return performDraw(canvasProvider);
   }
 
   void
@@ -56,19 +55,14 @@ public:
   void setPicture(std::shared_ptr<jsi::HostObject> picture) {
     if (picture == nullptr) {
       _picture = nullptr;
-      return;
+    } else {
+      _picture = std::dynamic_pointer_cast<JsiSkPicture>(picture);
     }
-
-    _picture = std::dynamic_pointer_cast<JsiSkPicture>(picture);
     _requestRedraw();
   }
 
 private:
-  void performDraw(std::shared_ptr<RNSkCanvasProvider> canvasProvider) {
-    if (_picture == nullptr) {
-      return;
-    }
-
+  bool performDraw(std::shared_ptr<RNSkCanvasProvider> canvasProvider) {
     canvasProvider->renderToCanvas([=](SkCanvas *canvas) {
       // Make sure to scale correctly
       auto pd = _platformContext->getPixelDensity();
@@ -76,10 +70,13 @@ private:
       canvas->save();
       canvas->scale(pd, pd);
 
-      canvas->drawPicture(_picture->getObject());
+      if (_picture != nullptr) {
+        canvas->drawPicture(_picture->getObject());
+      }
 
       canvas->restore();
     });
+    return true;
   }
 
   std::shared_ptr<RNSkPlatformContext> _platformContext;
@@ -109,7 +106,6 @@ public:
           // Clear picture
           std::static_pointer_cast<RNSkPictureRenderer>(getRenderer())
               ->setPicture(nullptr);
-          requestRedraw();
           continue;
         } else if (prop.second.getType() !=
                    RNJsi::JsiWrapperValueType::HostObject) {
@@ -121,9 +117,6 @@ public:
         // Save picture
         std::static_pointer_cast<RNSkPictureRenderer>(getRenderer())
             ->setPicture(prop.second.getAsHostObject());
-
-        // Request redraw
-        requestRedraw();
       }
     }
   }

package/cpp/rnskia/RNSkView.h

@@ -44,7 +44,7 @@ public:
   /**
    Render to a canvas
    */
-  virtual void renderToCanvas(const std::function<void(SkCanvas *)> &) = 0;
+  virtual bool renderToCanvas(const std::function<void(SkCanvas *)> &) = 0;
 
 protected:
   std::function<void()> _requestRedraw;
@@ -123,8 +123,9 @@ public:
   /**
    Render to a canvas
    */
-  void renderToCanvas(const std::function<void(SkCanvas *)> &cb) override {
+  bool renderToCanvas(const std::function<void(SkCanvas *)> &cb) override {
     cb(_surface->getCanvas());
+    return true;
   };
 
 private:
@@ -224,6 +225,15 @@ public:
    */
   void requestRedraw() { _redrawRequestCounter++; }
 
+  /**
+   Renders immediate. Be carefull to not call this method from another thread
+   than the UI thread
+   */
+  void renderImmediate() {
+    _renderer->renderImmediate(_canvasProvider);
+    _redrawRequestCounter = 0;
+  }
+
   /**
    Sets the native id of the view
    */
@@ -409,6 +419,7 @@ private:
 
   size_t _drawingLoopId = 0;
   std::atomic<int> _redrawRequestCounter = {1};
+  bool _initialDrawingDone = false;
 };
 
 } // namespace RNSkia

package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.h

@@ -24,7 +24,7 @@ public:
   float getScaledWidth() override;
   float getScaledHeight() override;
 
-  void renderToCanvas(const std::function<void(SkCanvas *)> &cb) override;
+  bool renderToCanvas(const std::function<void(SkCanvas *)> &cb) override;
 
   void setSize(int width, int height);
 

package/ios/RNSkia-iOS/RNSkMetalCanvasProvider.mm

@@ -63,10 +63,10 @@ float RNSkMetalCanvasProvider::getScaledHeight() {
 /**
  Render to a canvas
  */
-void RNSkMetalCanvasProvider::renderToCanvas(
+bool RNSkMetalCanvasProvider::renderToCanvas(
     const std::function<void(SkCanvas *)> &cb) {
   if (_width <= 0 || _height <= 0) {
-    return;
+    return false;
   }
 
   // Make sure to NOT render or try any render operations while we're in the
@@ -82,7 +82,7 @@ void RNSkMetalCanvasProvider::renderToCanvas(
       _requestRedraw();
       // and don't draw now since it might cause errors in the metal renderer if
       // we try to render while in the background. (see above issue)
-      return;
+      return false;
     }
   }
 
@@ -113,7 +113,7 @@ void RNSkMetalCanvasProvider::renderToCanvas(
      */
     id<CAMetalDrawable> currentDrawable = [_layer nextDrawable];
     if (currentDrawable == nullptr) {
-      return;
+      return false;
     }
 
     GrMtlTextureInfo fbInfo;
@@ -129,7 +129,7 @@ void RNSkMetalCanvasProvider::renderToCanvas(
     if (skSurface == nullptr || skSurface->getCanvas() == nullptr) {
       RNSkia::RNSkLogger::logToConsole(
           "Skia surface could not be created from parameters.");
-      return;
+      return false;
     }
 
     SkCanvas *canvas = skSurface->getCanvas();
@@ -142,6 +142,8 @@ void RNSkMetalCanvasProvider::renderToCanvas(
     [commandBuffer presentDrawable:currentDrawable];
     [commandBuffer commit];
   }
+
+  return true;
 };
 
 void RNSkMetalCanvasProvider::setSize(int width, int height) {

package/ios/RNSkia-iOS/SkiaUIView.mm

@@ -93,6 +93,16 @@
   assert(_impl == nullptr);
 }
 
+#pragma Render
+
+- (void)drawRect:(CGRect)rect {
+  // We override drawRect to ensure we to direct rendering when the
+  // underlying OS view needs to render:
+  if (_impl != nullptr) {
+    _impl->getDrawView()->renderImmediate();
+  }
+}
+
 #pragma mark Layout
 
 - (void)layoutSubviews {

package/package.json

@@ -7,7 +7,7 @@
     "setup-skia-web": "./scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "0.1.194",
+  "version": "0.1.196",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "files": [

package/cpp/skia/include/core/SkEncodedImageFormat.h

@@ -1,9 +0,0 @@
-/*
- * Copyright 2023 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// TODO(kjlubick) remove this shim after clients have been moved to the new location
-#include "include/codec/SkEncodedImageFormat.h" // IWYU pragma: export

package/cpp/skia/include/core/SkICC.h

@@ -1,9 +0,0 @@
-/*
- * Copyright 2023 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// TODO(kjlubick) remove this shim after clients have been moved to the new location
-#include "include/encode/SkICC.h" // IWYU pragma: export