@shopify/react-native-skia 1.0.4 → 1.0.6

package/android/CMakeLists.txt

@@ -46,6 +46,7 @@ add_library(
         "${PROJECT_SOURCE_DIR}/cpp/jni/JniPlatformContext.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/RNSkOpenGLCanvasProvider.cpp"
         "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/SkiaOpenGLSurfaceFactory.cpp"
+        "${PROJECT_SOURCE_DIR}/cpp/rnskia-android/GrAHardwareBufferUtils.cpp"
 
         "${PROJECT_SOURCE_DIR}/../cpp/jsi/JsiHostObject.cpp"
         "${PROJECT_SOURCE_DIR}/../cpp/jsi/JsiValue.cpp"
@@ -80,14 +81,9 @@ target_include_directories(
         cpp/jni/include
         cpp/rnskia-android
 
-        ../cpp/skia/include/config/
-        ../cpp/skia/include/core/
-        ../cpp/skia/include/effects/
-        ../cpp/skia/include/utils/
-        ../cpp/skia/include/pathops/
-        ../cpp/skia/modules/
-        ../cpp/skia/modules/skparagraph/include/
-        ../cpp/skia/include/
+        # Skia headers have to be included with "fully"-qualified paths,
+        # so "include/core/SkRef.h" instead of "SkRef.h", as otherwise
+        # the prefab cannot be shipped.
         ../cpp/skia
 
         ../cpp/api

package/android/build.gradle

@@ -161,6 +161,9 @@ android {
     }
 
     sourceSets.main {
+        jniLibs {
+            srcDirs += ['../libs/android']
+        }
         java {
             if (!isNewArchitectureEnabled()) {
                 srcDirs += [
@@ -309,16 +312,20 @@ extractJNIFiles.mustRunAfter extractAARHeaders
 if (ENABLE_PREFAB) {
     // Package all the cpp code in a flattened directory structure
     task prepareHeaders(type: Copy) {
+        from("../cpp")
         from("./cpp")
-        into "${project.buildDir}/headers/rnskia/"
+        into "${project.buildDir}/headers/rnskia/react-native-skia"
         includeEmptyDirs = false
         include "**/*.h"
         eachFile {
             String path = it.path
 
-            // Skip flattening third_party dir
             if (path.contains("api/third_party")) {
+                // Skip flattening third_party dir
                 path = path.substring("api/".length())
+            } else if (path.contains("skia/include") || path.contains("skia/modules") || path.contains("skia/src")) {
+                // Skip flattening Skia dir
+                path = path.substring("skia/".length())
             } else {
                 // flatten anything else
                 path = path.substring(path.lastIndexOf("/") + 1)

package/android/cpp/jni/JniPlatformContext.cpp

@@ -4,18 +4,18 @@
 #include <thread>
 #include <utility>
 
-#include "SkData.h"
-#include "SkRefCnt.h"
-#include "SkStream.h"
-#include "SkTypes.h"
+#include "include/core/SkData.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkTypes.h"
 
 #include <android/bitmap.h>
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include "SkBitmap.h"
-#include "SkPixmap.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkPixmap.h"
 
 #pragma clang diagnostic pop
 
@@ -216,4 +216,4 @@ void JniPlatformContext::raiseError(const std::exception &err) {
   method(javaPart_.get(), std::string(err.what()));
 }
 
-} // namespace RNSkia
+} // namespace RNSkia

package/android/cpp/jni/JniSkiaManager.cpp

@@ -5,7 +5,7 @@
 #include <string>
 #include <utility>
 
-#include <RNSkManager.h>
+#include "RNSkManager.h"
 
 namespace {
 

package/android/cpp/jni/include/JniSkiaBaseView.h

@@ -7,8 +7,8 @@
 #include <jni.h>
 #include <jsi/jsi.h>
 
-#include <JniSkiaManager.h>
-#include <RNSkAndroidView.h>
+#include "JniSkiaManager.h"
+#include "RNSkAndroidView.h"
 
 #include <android/bitmap.h>
 

package/android/cpp/jni/include/JniSkiaDomView.h

@@ -7,10 +7,10 @@
 #include <jni.h>
 #include <jsi/jsi.h>
 
-#include <JniSkiaBaseView.h>
-#include <JniSkiaManager.h>
-#include <RNSkAndroidView.h>
-#include <RNSkDomView.h>
+#include "JniSkiaBaseView.h"
+#include "JniSkiaManager.h"
+#include "RNSkAndroidView.h"
+#include "RNSkDomView.h"
 
 #include <android/native_window.h>
 #include <android/native_window_jni.h>

package/android/cpp/jni/include/JniSkiaManager.h

@@ -7,10 +7,10 @@
 #include <memory>
 #include <react/jni/JRuntimeExecutor.h>
 
-#include <JniPlatformContext.h>
-#include <RNSkAndroidPlatformContext.h>
-#include <RNSkLog.h>
-#include <RNSkManager.h>
+#include "JniPlatformContext.h"
+#include "RNSkAndroidPlatformContext.h"
+#include "RNSkLog.h"
+#include "RNSkManager.h"
 
 namespace RNSkia {
 

package/android/cpp/jni/include/JniSkiaPictureView.h

@@ -7,10 +7,10 @@
 #include <jni.h>
 #include <jsi/jsi.h>
 
-#include <JniSkiaBaseView.h>
-#include <JniSkiaManager.h>
-#include <RNSkAndroidView.h>
-#include <RNSkPictureView.h>
+#include "JniSkiaBaseView.h"
+#include "JniSkiaManager.h"
+#include "RNSkAndroidView.h"
+#include "RNSkPictureView.h"
 
 #include <android/native_window.h>
 #include <android/native_window_jni.h>

package/android/cpp/rnskia-android/GrAHardwareBufferUtils.cpp

@@ -0,0 +1,245 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "GrAHardwareBufferUtils.h"
+#if __ANDROID_API__ >= 26
+
+#define GL_GLEXT_PROTOTYPES
+#define EGL_EGLEXT_PROTOTYPES
+
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrDirectContext.h"
+#include "include/gpu/ganesh/gl/GrGLBackendSurface.h"
+#include "include/gpu/gl/GrGLTypes.h"
+#include "src/gpu/ganesh/gl/GrGLDefines.h"
+// #include "src/gpu/ganesh/GrDirectContextPriv.h"
+// #include "src/gpu/ganesh/gl/GrGLUtil.h"
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <GLES/gl.h>
+#include <GLES/glext.h>
+#include <android/hardware_buffer.h>
+
+#define PROT_CONTENT_EXT_STR "EGL_EXT_protected_content"
+#define EGL_PROTECTED_CONTENT_EXT 0x32C0
+
+namespace RNSkia {
+
+typedef EGLClientBuffer (*EGLGetNativeClientBufferANDROIDProc)(
+    const struct AHardwareBuffer *);
+typedef EGLImageKHR (*EGLCreateImageKHRProc)(EGLDisplay, EGLContext, EGLenum,
+                                             EGLClientBuffer, const EGLint *);
+typedef void (*EGLImageTargetTexture2DOESProc)(EGLenum, void *);
+
+GrBackendFormat GetGLBackendFormat(GrDirectContext *dContext,
+                                   uint32_t bufferFormat,
+                                   bool requireKnownFormat) {
+  GrBackendApi backend = dContext->backend();
+  if (backend != GrBackendApi::kOpenGL) {
+    return GrBackendFormat();
+  }
+  switch (bufferFormat) {
+  // TODO: find out if we can detect, which graphic buffers support
+  // GR_GL_TEXTURE_2D
+  case AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM:
+  case AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM:
+    return GrBackendFormats::MakeGL(GR_GL_RGBA8, GR_GL_TEXTURE_EXTERNAL);
+  case AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT:
+    return GrBackendFormats::MakeGL(GR_GL_RGBA16F, GR_GL_TEXTURE_EXTERNAL);
+  case AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM:
+    return GrBackendFormats::MakeGL(GR_GL_RGB565, GR_GL_TEXTURE_EXTERNAL);
+  case AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM:
+    return GrBackendFormats::MakeGL(GR_GL_RGB10_A2, GR_GL_TEXTURE_EXTERNAL);
+  case AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM:
+    return GrBackendFormats::MakeGL(GR_GL_RGB8, GR_GL_TEXTURE_EXTERNAL);
+#if __ANDROID_API__ >= 33
+  case AHARDWAREBUFFER_FORMAT_R8_UNORM:
+    return GrBackendFormats::MakeGL(GR_GL_R8, GR_GL_TEXTURE_EXTERNAL);
+#endif
+  default:
+    if (requireKnownFormat) {
+      return GrBackendFormat();
+    } else {
+      return GrBackendFormats::MakeGL(GR_GL_RGBA8, GR_GL_TEXTURE_EXTERNAL);
+    }
+  }
+  SkUNREACHABLE;
+}
+
+class GLTextureHelper {
+public:
+  GLTextureHelper(GrGLuint texID, EGLImageKHR image, EGLDisplay display,
+                  GrGLuint texTarget)
+      : fTexID(texID), fImage(image), fDisplay(display), fTexTarget(texTarget) {
+  }
+  ~GLTextureHelper() {
+    glDeleteTextures(1, &fTexID);
+    // eglDestroyImageKHR will remove a ref from the AHardwareBuffer
+    eglDestroyImageKHR(fDisplay, fImage);
+  }
+  void rebind(GrDirectContext *);
+
+private:
+  GrGLuint fTexID;
+  EGLImageKHR fImage;
+  EGLDisplay fDisplay;
+  GrGLuint fTexTarget;
+};
+
+void GLTextureHelper::rebind(GrDirectContext *dContext) {
+  glBindTexture(fTexTarget, fTexID);
+  GLenum status = GL_NO_ERROR;
+  if ((status = glGetError()) != GL_NO_ERROR) {
+    SkDebugf("glBindTexture(%#x, %d) failed (%#x)",
+             static_cast<int>(fTexTarget), static_cast<int>(fTexID),
+             static_cast<int>(status));
+    return;
+  }
+  glEGLImageTargetTexture2DOES(fTexTarget, fImage);
+  if ((status = glGetError()) != GL_NO_ERROR) {
+    SkDebugf("glEGLImageTargetTexture2DOES failed (%#x)",
+             static_cast<int>(status));
+    return;
+  }
+  dContext->resetContext(kTextureBinding_GrGLBackendState);
+}
+
+void delete_gl_texture(void *context) {
+  GLTextureHelper *cleanupHelper = static_cast<GLTextureHelper *>(context);
+  delete cleanupHelper;
+}
+
+void update_gl_texture(void *context, GrDirectContext *dContext) {
+  GLTextureHelper *cleanupHelper = static_cast<GLTextureHelper *>(context);
+  cleanupHelper->rebind(dContext);
+}
+
+static GrBackendTexture make_gl_backend_texture(
+    GrDirectContext *dContext, AHardwareBuffer *hardwareBuffer, int width,
+    int height, DeleteImageProc *deleteProc, UpdateImageProc *updateProc,
+    TexImageCtx *imageCtx, bool isProtectedContent,
+    const GrBackendFormat &backendFormat, bool isRenderable) {
+  while (GL_NO_ERROR != glGetError()) {
+  } // clear GL errors
+
+  EGLGetNativeClientBufferANDROIDProc eglGetNativeClientBufferANDROID =
+      (EGLGetNativeClientBufferANDROIDProc)eglGetProcAddress(
+          "eglGetNativeClientBufferANDROID");
+  if (!eglGetNativeClientBufferANDROID) {
+    RNSkLogger::logToConsole(
+        "Failed to get the eglGetNativeClientBufferAndroid proc");
+    return GrBackendTexture();
+  }
+
+  EGLClientBuffer clientBuffer =
+      eglGetNativeClientBufferANDROID(hardwareBuffer);
+  EGLint attribs[] = {EGL_IMAGE_PRESERVED_KHR, EGL_TRUE,
+                      isProtectedContent ? EGL_PROTECTED_CONTENT_EXT : EGL_NONE,
+                      isProtectedContent ? EGL_TRUE : EGL_NONE, EGL_NONE};
+  EGLDisplay display = eglGetCurrentDisplay();
+  // eglCreateImageKHR will add a ref to the AHardwareBuffer
+  EGLImageKHR image =
+      eglCreateImageKHR(display, EGL_NO_CONTEXT, EGL_NATIVE_BUFFER_ANDROID,
+                        clientBuffer, attribs);
+  if (EGL_NO_IMAGE_KHR == image) {
+    SkDebugf("Could not create EGL image, err = (%#x)",
+             static_cast<int>(eglGetError()));
+    return GrBackendTexture();
+  }
+
+  GrGLuint texID;
+  glGenTextures(1, &texID);
+  if (!texID) {
+    eglDestroyImageKHR(display, image);
+    return GrBackendTexture();
+  }
+
+  GrGLuint target = isRenderable ? GR_GL_TEXTURE_2D : GR_GL_TEXTURE_EXTERNAL;
+
+  glBindTexture(target, texID);
+  GLenum status = GL_NO_ERROR;
+  if ((status = glGetError()) != GL_NO_ERROR) {
+    SkDebugf("glBindTexture failed (%#x)", static_cast<int>(status));
+    glDeleteTextures(1, &texID);
+    eglDestroyImageKHR(display, image);
+    return GrBackendTexture();
+  }
+  glEGLImageTargetTexture2DOES(target, image);
+  if ((status = glGetError()) != GL_NO_ERROR) {
+    SkDebugf("glEGLImageTargetTexture2DOES failed (%#x)",
+             static_cast<int>(status));
+    glDeleteTextures(1, &texID);
+    eglDestroyImageKHR(display, image);
+    return GrBackendTexture();
+  }
+  dContext->resetContext(kTextureBinding_GrGLBackendState);
+
+  GrGLTextureInfo textureInfo;
+  textureInfo.fID = texID;
+  SkASSERT(backendFormat.isValid());
+  textureInfo.fTarget = target;
+  textureInfo.fFormat = GrBackendFormats::AsGLFormatEnum(backendFormat);
+  textureInfo.fProtected = skgpu::Protected(isProtectedContent);
+
+  *deleteProc = delete_gl_texture;
+  *updateProc = update_gl_texture;
+  *imageCtx = new GLTextureHelper(texID, image, display, target);
+
+  return GrBackendTextures::MakeGL(width, height, skgpu::Mipmapped::kNo,
+                                   textureInfo);
+}
+
+static bool can_import_protected_content_eglimpl() {
+  EGLDisplay dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+  const char *exts = eglQueryString(dpy, EGL_EXTENSIONS);
+  size_t cropExtLen = strlen(PROT_CONTENT_EXT_STR);
+  size_t extsLen = strlen(exts);
+  bool equal = !strcmp(PROT_CONTENT_EXT_STR, exts);
+  bool atStart = !strncmp(PROT_CONTENT_EXT_STR " ", exts, cropExtLen + 1);
+  bool atEnd =
+      (cropExtLen + 1) < extsLen &&
+      !strcmp(" " PROT_CONTENT_EXT_STR, exts + extsLen - (cropExtLen + 1));
+  bool inMiddle = strstr(exts, " " PROT_CONTENT_EXT_STR " ");
+  return equal || atStart || atEnd || inMiddle;
+}
+
+static bool can_import_protected_content(GrDirectContext *dContext) {
+  SkASSERT(GrBackendApi::kOpenGL == dContext->backend());
+  // Only compute whether the extension is present once the first time this
+  // function is called.
+  static bool hasIt = can_import_protected_content_eglimpl();
+  return hasIt;
+}
+
+GrBackendTexture
+MakeGLBackendTexture(GrDirectContext *dContext, AHardwareBuffer *hardwareBuffer,
+                     int width, int height, DeleteImageProc *deleteProc,
+                     UpdateImageProc *updateProc, TexImageCtx *imageCtx,
+                     bool isProtectedContent,
+                     const GrBackendFormat &backendFormat, bool isRenderable) {
+  SkASSERT(dContext);
+  if (!dContext || dContext->abandoned()) {
+    return GrBackendTexture();
+  }
+
+  if (GrBackendApi::kOpenGL != dContext->backend()) {
+    return GrBackendTexture();
+  }
+
+  if (isProtectedContent && !can_import_protected_content(dContext)) {
+    return GrBackendTexture();
+  }
+
+  return make_gl_backend_texture(
+      dContext, hardwareBuffer, width, height, deleteProc, updateProc, imageCtx,
+      isProtectedContent, backendFormat, isRenderable);
+}
+
+} // namespace RNSkia
+
+#endif

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

@@ -0,0 +1,33 @@
+#pragma once
+
+#include "include/core/SkTypes.h"
+
+#include "RNSkLog.h"
+
+#if __ANDROID_API__ >= 26
+
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrTypes.h"
+
+class GrDirectContext;
+
+extern "C" {
+typedef struct AHardwareBuffer AHardwareBuffer;
+}
+
+namespace RNSkia {
+
+typedef void *TexImageCtx;
+typedef void (*DeleteImageProc)(TexImageCtx);
+typedef void (*UpdateImageProc)(TexImageCtx, GrDirectContext *);
+
+GrBackendTexture
+MakeGLBackendTexture(GrDirectContext *dContext, AHardwareBuffer *hardwareBuffer,
+                     int width, int height, DeleteImageProc *deleteProc,
+                     UpdateImageProc *updateProc, TexImageCtx *imageCtx,
+                     bool isProtectedContent,
+                     const GrBackendFormat &backendFormat, bool isRenderable);
+
+} // namespace RNSkia
+
+#endif

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

@@ -5,9 +5,9 @@
 #include <memory>
 #include <string>
 
-#include <JniPlatformContext.h>
-#include <RNSkPlatformContext.h>
-#include <SkiaOpenGLSurfaceFactory.h>
+#include "JniPlatformContext.h"
+#include "RNSkPlatformContext.h"
+#include "SkiaOpenGLSurfaceFactory.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"

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

@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include <RNSkOpenGLCanvasProvider.h>
+#include "RNSkOpenGLCanvasProvider.h"
 #include <android/native_window.h>
 
 namespace RNSkia {

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

@@ -5,8 +5,8 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include "SkCanvas.h"
-#include "SkSurface.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
 
 #pragma clang diagnostic pop
 

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

@@ -12,9 +12,9 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include "SkCanvas.h"
-#include "SkColorSpace.h"
-#include "SkSurface.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColorSpace.h"
+#include "include/core/SkSurface.h"
 #include "include/gpu/GrDirectContext.h"
 #include "include/gpu/ganesh/gl/GrGLDirectContext.h"
 #include "include/gpu/gl/GrGLInterface.h"
@@ -307,4 +307,4 @@ private:
     return true;
   }
 };
-} // namespace RNSkia
+} // namespace RNSkia

package/android/cpp/rnskia-android/SkiaOpenGLSurfaceFactory.cpp

@@ -1,9 +1,11 @@
+#include "SkiaOpenGLSurfaceFactory.h"
+#include "GrAHardwareBufferUtils.h"
 #include "SkiaOpenGLHelper.h"
-#include <SkiaOpenGLSurfaceFactory.h>
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
+#include "include/gpu/ganesh/SkImageGanesh.h"
 #include "include/gpu/ganesh/gl/GrGLBackendSurface.h"
 
 #pragma clang diagnostic pop
@@ -12,6 +14,34 @@ namespace RNSkia {
 
 thread_local SkiaOpenGLContext ThreadContextHolder::ThreadSkiaOpenGLContext;
 
+sk_sp<SkImage>
+SkiaOpenGLSurfaceFactory::makeImageFromHardwareBuffer(const SkImageInfo &info,
+                                                      void *buffer) {
+#if __ANDROID_API__ >= 26
+  const AHardwareBuffer *hardwareBuffer =
+      static_cast<AHardwareBuffer *>(buffer);
+  DeleteImageProc deleteImageProc = nullptr;
+  UpdateImageProc updateImageProc = nullptr;
+  TexImageCtx deleteImageCtx = nullptr;
+  auto backendTex = MakeGLBackendTexture(
+      ThreadContextHolder::ThreadSkiaOpenGLContext.directContext.get(),
+      const_cast<AHardwareBuffer *>(hardwareBuffer), info.width(),
+      info.height(), &deleteImageProc, &updateImageProc, &deleteImageCtx, false,
+      // GR_GL_RGBA8 0x8058
+      // GR_GL_TEXTURE_EXTERNAL 0x8D65
+      GrBackendFormats::MakeGL(0x8058, 0x8D65), false);
+  sk_sp<SkImage> image = SkImages::BorrowTextureFrom(
+      ThreadContextHolder::ThreadSkiaOpenGLContext.directContext.get(),
+      backendTex, kTopLeft_GrSurfaceOrigin, kRGBA_8888_SkColorType,
+      kPremul_SkAlphaType, nullptr);
+  return image;
+#else
+  RNSkLogger::logToConsole(
+      "Hardware buffer in only supported on Android API level 26 and above.");
+  return nullptr;
+#endif
+}
+
 sk_sp<SkSurface> SkiaOpenGLSurfaceFactory::makeOffscreenSurface(int width,
                                                                 int height) {
   // Setup OpenGL and Skia:
@@ -150,4 +180,4 @@ sk_sp<SkSurface> WindowSurfaceHolder::getSurface() {
   return _skSurface;
 }
 
-} // namespace RNSkia
+} // namespace RNSkia

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

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <RNSkLog.h>
+#include "RNSkLog.h"
 
 #include <fbjni/fbjni.h>
 #include <jni.h>
@@ -18,9 +18,9 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include "SkCanvas.h"
-#include "SkColorSpace.h"
-#include "SkSurface.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColorSpace.h"
+#include "include/core/SkSurface.h"
 #include "include/gpu/GrBackendSurface.h"
 #include "include/gpu/GrDirectContext.h"
 #include "include/gpu/ganesh/SkSurfaceGanesh.h"
@@ -149,6 +149,9 @@ public:
    */
   static sk_sp<SkSurface> makeOffscreenSurface(int width, int height);
 
+  static sk_sp<SkImage> makeImageFromHardwareBuffer(const SkImageInfo &info,
+                                                    void *buffer);
+
   /**
    * Creates a windowed Skia Surface holder.
    * @param width Initial width of surface

package/android/src/main/java/com/shopify/reactnative/skia/ViewScreenshotService.java

@@ -14,6 +14,7 @@ import android.view.SurfaceView;
 import android.view.TextureView;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ScrollView;
 import androidx.annotation.NonNull;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.uimanager.UIManagerModule;
@@ -70,6 +71,17 @@ public class ViewScreenshotService {
         canvas.save();
         applyTransformations(canvas, view);
 
+        // If the view is a ScrollView or similar, clip to its bounds
+        if (view instanceof ScrollView) {
+            ScrollView scrollView = (ScrollView) view;
+            int clipLeft = scrollView.getScrollX();
+            int clipTop = scrollView.getScrollY();
+            int clipRight = clipLeft + scrollView.getWidth();
+            int clipBottom = clipTop + scrollView.getHeight();
+
+            canvas.clipRect(clipLeft, clipTop, clipRight, clipBottom);
+        }
+
         if (view instanceof ViewGroup) {
             ViewGroup group = (ViewGroup) view;
             drawBackgroundIfPresent(canvas, view, combinedOpacity);
@@ -166,7 +178,10 @@ public class ViewScreenshotService {
     private static void applyTransformations(final Canvas c, @NonNull final View view) {
         final Matrix matrix = view.getMatrix();
         final Matrix translateMatrix = new Matrix();
-        translateMatrix.setTranslate(view.getLeft() + view.getPaddingLeft(), view.getTop() + view.getPaddingTop());
+
+        translateMatrix.setTranslate(view.getLeft() + view.getPaddingLeft() - view.getScrollX(),
+                view.getTop() + view.getPaddingTop() - view.getScrollY());
+
         c.concat(translateMatrix);
         c.concat(matrix);
     }

package/cpp/api/JsiSkAnimatedImage.h

@@ -11,8 +11,8 @@
 #pragma clang diagnostic ignored "-Wdocumentation"
 
 #include "JsiSkImage.h"
-#include "SkStream.h"
 #include "include/codec/SkEncodedImageFormat.h"
+#include "include/core/SkStream.h"
 
 #include "include/android/SkAnimatedImage.h"
 #include "include/codec/SkAndroidCodec.h"

package/cpp/api/JsiSkCanvas.h

@@ -26,14 +26,14 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include "SkCanvas.h"
-#include "SkFont.h"
-#include "SkPaint.h"
-#include "SkPath.h"
-#include "SkPicture.h"
-#include "SkRegion.h"
-#include "SkSurface.h"
-#include "SkTypeface.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkFont.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkPicture.h"
+#include "include/core/SkRegion.h"
+#include "include/core/SkSurface.h"
+#include "include/core/SkTypeface.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkColor.h

@@ -12,7 +12,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include "SkColor.h"
+#include "include/core/SkColor.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkColorFilter.h

@@ -8,7 +8,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include "SkColorFilter.h"
+#include "include/core/SkColorFilter.h"
 
 #pragma clang diagnostic pop