@shopify/react-native-skia 0.1.191 → 0.1.193

package/cpp/api/JsiSkPicture.h

@@ -23,12 +23,6 @@ public:
                const sk_sp<SkPicture> picture)
       : JsiSkWrappingSkPtrHostObject<SkPicture>(context, picture) {}
 
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Picture");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkPicture, __typename__))
-
   JSI_HOST_FUNCTION(makeShader) {
     auto tmx = (SkTileMode)arguments[0].asNumber();
     auto tmy = (SkTileMode)arguments[1].asNumber();
@@ -66,18 +60,10 @@ public:
     return array;
   }
 
+  EXPORT_JSI_API_TYPENAME(JsiSkPicture, "Picture")
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPicture, makeShader),
-                       JSI_EXPORT_FUNC(JsiSkPicture, serialize))
-
-  /**
-   Returns the underlying object from a host object of this type
-  */
-  static sk_sp<SkPicture> fromValue(jsi::Runtime &runtime,
-                                    const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkPicture>(runtime)
-        .get()
-        ->getObject();
-  }
+                       JSI_EXPORT_FUNC(JsiSkPicture, serialize),
+                       JSI_EXPORT_FUNC(JsiSkPicture, dispose))
 };
 } // namespace RNSkia

package/cpp/api/JsiSkPictureRecorder.h

@@ -40,9 +40,12 @@ public:
         runtime, std::make_shared<JsiSkPicture>(getContext(), picture));
   }
 
+  EXPORT_JSI_API_TYPENAME(JsiSkPictureRecorder, "PictureRecorder")
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPictureRecorder, beginRecording),
                        JSI_EXPORT_FUNC(JsiSkPictureRecorder,
-                                       finishRecordingAsPicture))
+                                       finishRecordingAsPicture),
+                       JSI_EXPORT_FUNC(JsiSkPictureRecorder, dispose))
 
   static const jsi::HostFunctionType
   createCtor(std::shared_ptr<RNSkPlatformContext> context) {

package/cpp/api/JsiSkPoint.h

@@ -24,8 +24,13 @@ public:
 
   JSI_PROPERTY_GET(y) { return static_cast<double>(getObject()->y()); }
 
+  JSI_API_TYPENAME("Point");
+
   JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkPoint, x),
-                              JSI_EXPORT_PROP_GET(JsiSkPoint, y))
+                              JSI_EXPORT_PROP_GET(JsiSkPoint, y),
+                              JSI_EXPORT_PROP_GET(JsiSkPoint, __typename__))
+
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPoint, dispose))
 
   JsiSkPoint(std::shared_ptr<RNSkPlatformContext> context, const SkPoint &point)
       : JsiSkWrappingSharedPtrHostObject<SkPoint>(

package/cpp/api/JsiSkRRect.h

@@ -34,9 +34,14 @@ public:
         std::make_shared<JsiSkRect>(getContext(), getObject()->getBounds()));
   }
 
+  JSI_API_TYPENAME("RRect");
+
   JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkRRect, rx),
                               JSI_EXPORT_PROP_GET(JsiSkRRect, ry),
-                              JSI_EXPORT_PROP_GET(JsiSkRRect, rect))
+                              JSI_EXPORT_PROP_GET(JsiSkRRect, rect),
+                              JSI_EXPORT_PROP_GET(JsiSkRRect, __typename__))
+
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRRect, dispose))
 
   JsiSkRRect(std::shared_ptr<RNSkPlatformContext> context, const SkRRect &rect)
       : JsiSkWrappingSharedPtrHostObject<SkRRect>(

package/cpp/api/JsiSkRSXform.h

@@ -25,11 +25,7 @@ public:
       : JsiSkWrappingSharedPtrHostObject<SkRSXform>(
             std::move(context), std::make_shared<SkRSXform>(rsxform)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "RSXform");
-  }
+  JSI_API_TYPENAME("RSXform");
 
   JSI_PROPERTY_GET(scos) {
     return jsi::Value(SkScalarToDouble(getObject()->fSCos));
@@ -48,7 +44,9 @@ public:
                               JSI_EXPORT_PROP_GET(JsiSkRSXform, scos),
                               JSI_EXPORT_PROP_GET(JsiSkRSXform, ssin),
                               JSI_EXPORT_PROP_GET(JsiSkRSXform, tx),
-                              JSI_EXPORT_PROP_GET(JsiSkRSXform, ty), )
+                              JSI_EXPORT_PROP_GET(JsiSkRSXform, ty))
+
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRSXform, dispose))
 
   /**
   Returns the underlying object from a host object of this type

package/cpp/api/JsiSkRect.h

@@ -33,10 +33,13 @@ public:
     return static_cast<double>(getObject()->bottom());
   }
 
+  JSI_API_TYPENAME("Rect");
+
   JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkRect, x),
                               JSI_EXPORT_PROP_GET(JsiSkRect, y),
                               JSI_EXPORT_PROP_GET(JsiSkRect, width),
-                              JSI_EXPORT_PROP_GET(JsiSkRect, height))
+                              JSI_EXPORT_PROP_GET(JsiSkRect, height),
+                              JSI_EXPORT_PROP_GET(JsiSkRect, __typename__))
 
   JSI_HOST_FUNCTION(setXYWH) {
     getObject()->setXYWH(arguments[0].asNumber(), arguments[1].asNumber(),
@@ -51,7 +54,8 @@ public:
   }
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRect, setXYWH),
-                       JSI_EXPORT_FUNC(JsiSkRect, setLTRB), )
+                       JSI_EXPORT_FUNC(JsiSkRect, setLTRB),
+                       JSI_EXPORT_FUNC(JsiSkRect, dispose))
 
   /**
    Constructor

package/cpp/api/JsiSkRuntimeEffect.h

@@ -32,12 +32,6 @@ struct RuntimeEffectUniform {
 class JsiSkRuntimeEffect
     : public JsiSkWrappingSkPtrHostObject<SkRuntimeEffect> {
 public:
-  static sk_sp<SkRuntimeEffect> fromValue(jsi::Runtime &runtime,
-                                          const jsi::Value &obj) {
-    const auto &object = obj.asObject(runtime);
-    return object.asHostObject<JsiSkRuntimeEffect>(runtime)->getObject();
-  }
-
   JSI_HOST_FUNCTION(makeShader) {
     auto uniforms = castUniforms(runtime, arguments[0]);
 
@@ -121,6 +115,8 @@ public:
     return jsi::String::createFromAscii(runtime, getObject()->source());
   }
 
+  EXPORT_JSI_API_TYPENAME(JsiSkRuntimeEffect, "RuntimeEffect")
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRuntimeEffect, makeShader),
                        JSI_EXPORT_FUNC(JsiSkRuntimeEffect,
                                        makeShaderWithChildren),
@@ -129,7 +125,8 @@ public:
                                        getUniformFloatCount),
                        JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniformName),
                        JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniform),
-                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, source))
+                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, source),
+                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, dispose))
 
   JsiSkRuntimeEffect(std::shared_ptr<RNSkPlatformContext> context,
                      sk_sp<SkRuntimeEffect> rt)

package/cpp/api/JsiSkRuntimeShaderBuilder.h

@@ -47,16 +47,8 @@ public:
     return jsi::Value::undefined();
   }
 
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRuntimeShaderBuilder, setUniform))
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static std::shared_ptr<SkRuntimeShaderBuilder>
-  fromValue(jsi::Runtime &runtime, const jsi::Value &obj) {
-    const auto &object = obj.asObject(runtime);
-    return object.asHostObject<JsiSkRuntimeShaderBuilder>(runtime)->getObject();
-  }
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRuntimeShaderBuilder, setUniform),
+                       JSI_EXPORT_FUNC(JsiSkRuntimeShaderBuilder, dispose))
 
   /**
     Returns the jsi object from a host object of this type

package/cpp/api/JsiSkSVG.h

@@ -24,9 +24,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkSVGDOM>(std::move(context),
                                                std::move(svgdom)) {}
 
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "SVG");
-  }
+  EXPORT_JSI_API_TYPENAME(JsiSkSVG, "SVG")
 
   JSI_HOST_FUNCTION(width) {
     return static_cast<double>(getObject()->containerSize().width());
@@ -36,13 +34,6 @@ public:
     return static_cast<double>(getObject()->containerSize().height());
   }
 
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkSVG, __typename__))
-
-  JSI_HOST_FUNCTION(dispose) {
-    setObject(nullptr);
-    return jsi::Value::undefined();
-  }
-
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkSVG, width),
                        JSI_EXPORT_FUNC(JsiSkSVG, height),
                        JSI_EXPORT_FUNC(JsiSkSVG, dispose))

package/cpp/api/JsiSkShader.h

@@ -26,21 +26,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkShader>(std::move(context),
                                                std::move(shader)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Shader");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkShader, __typename__))
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkShader> fromValue(jsi::Runtime &runtime,
-                                   const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkShader>(runtime)
-        ->getObject();
-  }
+  EXPORT_JSI_API_TYPENAME(JsiSkShader, "Shader")
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkShader, dispose))
 };
 } // namespace RNSkia

package/cpp/api/JsiSkSurface.h

@@ -29,10 +29,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkSurface>(std::move(context),
                                                 std::move(surface)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Surface");
-  }
+  EXPORT_JSI_API_TYPENAME(JsiSkSurface, "Surface")
 
   JSI_HOST_FUNCTION(getCanvas) {
     return jsi::Object::createFromHostObject(
@@ -58,20 +55,10 @@ public:
         runtime, std::make_shared<JsiSkImage>(getContext(), std::move(image)));
   }
 
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkSurface, __typename__))
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkSurface, getCanvas),
                        JSI_EXPORT_FUNC(JsiSkSurface, makeImageSnapshot),
-                       JSI_EXPORT_FUNC(JsiSkSurface, flush))
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkSurface> fromValue(jsi::Runtime &runtime,
-                                    const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkSurface>(runtime)
-        ->getObject();
-  }
+                       JSI_EXPORT_FUNC(JsiSkSurface, flush),
+                       JSI_EXPORT_FUNC(JsiSkSurface, dispose))
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkTextBlob.h

@@ -25,23 +25,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkTextBlob>(std::move(context),
                                                  std::move(shader)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "TextBlob");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkTextBlob,
-                                                  __typename__), )
-
-  /**
-  Returns the underlying object from a host object of this type
- */
-  static sk_sp<SkTextBlob> fromValue(jsi::Runtime &runtime,
-                                     const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkTextBlob>(runtime)
-        ->getObject();
-  }
+  EXPORT_JSI_API_TYPENAME(JsiSkTextBlob, "TextBlob")
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkTextBlob, dispose))
 };
 } // namespace RNSkia

package/cpp/api/JsiSkTypeface.h

@@ -22,34 +22,13 @@ namespace jsi = facebook::jsi;
 
 class JsiSkTypeface : public JsiSkWrappingSkPtrHostObject<SkTypeface> {
 public:
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Typeface");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkTypeface, __typename__))
-
-  JSI_HOST_FUNCTION(dispose) {
-    setObject(nullptr);
-    return jsi::Value::undefined();
-  }
-
+  EXPORT_JSI_API_TYPENAME(JsiSkTypeface, "Typeface")
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkTypeface, dispose))
 
   JsiSkTypeface(std::shared_ptr<RNSkPlatformContext> context,
                 sk_sp<SkTypeface> typeface)
       : JsiSkWrappingSkPtrHostObject(std::move(context), std::move(typeface)) {}
 
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkTypeface> fromValue(jsi::Runtime &runtime,
-                                     const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkTypeface>(runtime)
-        ->getObject();
-  }
-
   /**
    Returns the jsi object from a host object of this type
   */

package/cpp/api/JsiSkVertices.h

@@ -25,12 +25,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkVertices>(std::move(context),
                                                  std::move(vertices)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Vertices");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkVertices, __typename__))
+  EXPORT_JSI_API_TYPENAME(JsiSkVertices, "Vertices")
 
   JSI_HOST_FUNCTION(bounds) {
     const auto &result = getObject()->bounds();
@@ -43,17 +38,8 @@ public:
   }
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkVertices, bounds),
-                       JSI_EXPORT_FUNC(JsiSkVertices, uniqueID), )
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkVertices> fromValue(jsi::Runtime &runtime,
-                                     const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkVertices>(runtime)
-        ->getObject();
-  }
+                       JSI_EXPORT_FUNC(JsiSkVertices, uniqueID),
+                       JSI_EXPORT_FUNC(JsiSkVertices, dispose))
 
   /**
    * Creates the function for construction a new instance of the SkVertices

package/cpp/rnskia/dom/base/Declaration.h

@@ -24,17 +24,15 @@ public:
   void push(T el) { _elements.push(el); }
 
   // Clears and returns all elements
-  std::vector<T> popAll() { return popMultiple(_elements.size()); }
-
-  // Pops the number of items up to limit
-  std::vector<T> popMultiple(size_t limit) {
-    auto size = std::min(limit, _elements.size());
+  std::vector<T> popAll() {
+    auto size = _elements.size();
     std::vector<T> tmp;
     tmp.reserve(size);
     for (size_t i = 0; i < size; ++i) {
       tmp.push_back(_elements.top());
       _elements.pop();
     }
+    std::reverse(std::begin(tmp), std::end(tmp));
     return tmp;
   }
 
@@ -50,7 +48,7 @@ public:
   // Clears and returns through reducer function in reversed order
   T popAsOne(std::function<T(T inner, T outer)> composer) {
     auto tmp = popAll();
-    // std::reverse(std::begin(tmp), std::end(tmp));
+    std::reverse(std::begin(tmp), std::end(tmp));
     return std::accumulate(std::begin(tmp), std::end(tmp),
                            static_cast<T>(nullptr), [=](T inner, T outer) {
                              if (inner == nullptr) {
@@ -63,7 +61,7 @@ public:
   // Returns the size of the elements
   size_t size() { return _elements.size(); }
 
-protected:
+private:
   std::stack<T> _elements;
 };
 

package/cpp/rnskia/dom/nodes/JsiBlurMaskNode.h

@@ -10,6 +10,7 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
+#include "SkBlurTypes.h"
 #include "SkMaskFilter.h"
 
 #pragma clang diagnostic pop

package/cpp/rnskia/dom/nodes/JsiPathNode.h

@@ -108,8 +108,8 @@ protected:
           // _path is const so we can't mutate it directly, let's replace the
           // path like this:
           auto p = std::make_shared<SkPath>(*_path.get());
-          if (!strokePaint.getFillPath(*_path.get(), p.get(), nullptr,
-                                       precision)) {
+          if (!skpathutils::FillPathWithPaint(*_path.get(), strokePaint,
+                                              p.get(), nullptr, precision)) {
             _path = nullptr;
           } else {
             _path = std::const_pointer_cast<const SkPath>(p);

package/cpp/rnskia/dom/props/BoxShadowProps.h

@@ -5,6 +5,8 @@
 #include <memory>
 #include <utility>
 
+#include "SkBlurTypes.h"
+
 namespace RNSkia {
 
 class BoxShadowProps : public DerivedProp<SkPaint> {

package/cpp/rnskia/values/RNSkReadonlyValue.h

@@ -72,13 +72,13 @@ public:
         });
   }
 
-  JSI_HOST_FUNCTION(__invalidate) {
+  JSI_HOST_FUNCTION(dispose) {
     invalidate();
     return jsi::Value::undefined();
   }
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(RNSkReadonlyValue, addListener),
-                       JSI_EXPORT_FUNC(RNSkReadonlyValue, __invalidate))
+                       JSI_EXPORT_FUNC(RNSkReadonlyValue, dispose))
 
   /**
    * Adds a callback that will be called whenever the value changes

package/cpp/rnskia/values/RNSkValue.h

@@ -70,7 +70,7 @@ public:
                               JSI_EXPORT_PROP_GET(RNSkValue, animation))
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(RNSkValue, addListener),
-                       JSI_EXPORT_FUNC(RNSkReadonlyValue, __invalidate))
+                       JSI_EXPORT_FUNC(RNSkReadonlyValue, dispose))
 
 private:
   void subscribe(std::shared_ptr<RNSkAnimation> animation) {

package/cpp/skia/include/android/SkAndroidFrameworkUtils.h

@@ -27,7 +27,7 @@ class SkShader;
 class SkAndroidFrameworkUtils {
 public:
 
-#if SK_SUPPORT_GPU
+#if defined(SK_GANESH)
     /**
      *  clipWithStencil draws the current clip into a stencil buffer with reference value and mask
      *  set to 0x1. This function works only on a GPU canvas.
@@ -37,7 +37,7 @@ public:
      *  @return true on success or false if clip is empty or not a GPU canvas.
      */
     static bool clipWithStencil(SkCanvas* canvas);
-#endif //SK_SUPPORT_GPU
+#endif //defined(SK_GANESH)
 
     static void SafetyNetLog(const char*);
 
@@ -58,12 +58,6 @@ public:
      */
     static SkCanvas* getBaseWrappedCanvas(SkCanvas* canvas);
 
-    /**
-     * Skia will change the order in which local matrices concatenate. In order to not break Android
-     * apps targeting older API levels we offer this function to use the legacy concatenation order.
-     */
-    static void UseLegacyLocalMatrixConcatenation();
-
     /**
      *  If the shader represents a linear gradient ShaderAsALinearGradient
      *  returns true and if info is not null, ShaderAsALinearGradient populates

package/cpp/skia/include/android/SkImageAndroid.h

@@ -0,0 +1,101 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkImageAndroid_DEFINED
+#define SkImageAndroid_DEFINED
+
+#include "include/core/SkImage.h"
+#include "include/core/SkRefCnt.h"
+#include "include/gpu/GrTypes.h"
+
+class SkColorSpace;
+class GrDirectContext;
+class SkPixmap;
+struct AHardwareBuffer;
+
+namespace SkImages {
+
+/** (See Skia bug 7447)
+    Creates SkImage from Android hardware buffer.
+    Returned SkImage takes a reference on the buffer.
+    Only available on Android, when __ANDROID_API__ is defined to be 26 or greater.
+    @param hardwareBuffer  AHardwareBuffer Android hardware buffer
+    @param colorSpace      range of colors; may be nullptr
+    @return                created SkImage, or nullptr
+*/
+SK_API sk_sp<SkImage> DeferredFromAHardwareBuffer(AHardwareBuffer* hardwareBuffer,
+                                                  SkAlphaType alphaType = kPremul_SkAlphaType);
+SK_API sk_sp<SkImage> DeferredFromAHardwareBuffer(
+        AHardwareBuffer* hardwareBuffer,
+        SkAlphaType alphaType,
+        sk_sp<SkColorSpace> colorSpace,
+        GrSurfaceOrigin surfaceOrigin = kTopLeft_GrSurfaceOrigin);
+
+/** Creates SkImage from Android hardware buffer and uploads the data from the SkPixmap to it.
+    Returned SkImage takes a reference on the buffer.
+    Only available on Android, when __ANDROID_API__ is defined to be 26 or greater.
+    @param context         GPU context
+    @param pixmap          SkPixmap that contains data to be uploaded to the AHardwareBuffer
+    @param hardwareBuffer  AHardwareBuffer Android hardware buffer
+    @param surfaceOrigin   surface origin for resulting image
+    @return                created SkImage, or nullptr
+*/
+SK_API sk_sp<SkImage> TextureFromAHardwareBufferWithData(
+        GrDirectContext* context,
+        const SkPixmap& pixmap,
+        AHardwareBuffer* hardwareBuffer,
+        GrSurfaceOrigin surfaceOrigin = kTopLeft_GrSurfaceOrigin);
+
+/**
+ *  Like SkImagePriv::SkMakeImageFromRasterBitmap, except this can be pinned using
+ *  skgpu::ganesh::PinAsTexture and CopyPixelMode is never.
+ */
+SK_API sk_sp<SkImage> PinnableRasterFromBitmap(const SkBitmap&);
+
+}  // namespace SkImages
+
+// TODO(kjlubick) remove this after Android has been ported.
+namespace sk_image_factory {
+inline sk_sp<SkImage> MakePinnableFromRasterBitmap(const SkBitmap& b) {
+    return SkImages::PinnableRasterFromBitmap(b);
+}
+}  // namespace sk_image_factory
+
+namespace skgpu::ganesh {
+/**
+ *  Will attempt to upload and lock the contents of the image as a texture, so that subsequent
+ *  draws to a gpu-target will come from that texture (and not by looking at the original image
+ *  src). In particular this is intended to use the texture even if the image's original content
+ *  changes subsequent to this call (i.e. the src is mutable!).
+ *
+ *  Only compatible with SkImages created from SkImages::PinnableRasterFromBitmap.
+ *
+ *  All successful calls must be balanced by an equal number of calls to UnpinTexture().
+ *
+ *  Once in this "pinned" state, the image has all of the same thread restrictions that exist
+ *  for a natively created gpu image (e.g. SkImage::MakeFromTexture)
+ *  - all drawing, pinning, unpinning must happen in the same thread as the GrContext.
+ *
+ *  @return true if the image was successfully uploaded and locked into a texture
+ */
+bool PinAsTexture(GrRecordingContext*, SkImage*);
+
+/**
+ *  The balancing call to a successful invocation of PinAsTexture. When a balanced
+ *  number of calls have been made, then the "pinned" texture is free to be purged, etc. This
+ *  also means that a subsequent "pin" call will look at the original content again, and if
+ *  its uniqueID/generationID has changed, then a newer texture will be uploaded/pinned.
+ *
+ *  Only compatible with SkImages created from SkImages::PinnableRasterFromBitmap.
+ *
+ *  The context passed to unpin must match the one passed to pin.
+ */
+void UnpinTexture(GrRecordingContext*, SkImage*);
+
+} // namespace skgpu::ganesh
+
+#endif

package/cpp/skia/include/codec/SkAndroidCodec.h

@@ -9,24 +9,27 @@
 #define SkAndroidCodec_DEFINED
 
 #include "include/codec/SkCodec.h"
-#include "include/core/SkAlphaType.h"
 #include "include/core/SkColorSpace.h"
-#include "include/core/SkColorType.h"
-#include "include/core/SkEncodedImageFormat.h"
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSize.h"
 #include "include/core/SkTypes.h"
 #include "include/private/SkEncodedInfo.h"
-#include "include/private/SkNoncopyable.h"
+#include "include/private/base/SkNoncopyable.h"
 #include "modules/skcms/skcms.h"
 
+// TODO(kjlubick, bungeman) Replace these includes with forward declares
+#include "include/codec/SkEncodedImageFormat.h" // IWYU pragma: keep
+#include "include/core/SkAlphaType.h" // IWYU pragma: keep
+#include "include/core/SkColorType.h" // IWYU pragma: keep
+
 #include <cstddef>
 #include <memory>
 
 class SkData;
 class SkPngChunkReader;
 class SkStream;
+struct SkGainmapInfo;
 struct SkIRect;
 
 /**
@@ -118,10 +121,8 @@ public:
     /**
      *  @param outputColorType Color type that the client will decode to.
      *  @param prefColorSpace  Preferred color space to decode to.
-     *                         This may not return |prefColorSpace| for a couple reasons.
-     *                         (1) Android Principles: 565 must be sRGB, F16 must be
-     *                             linear sRGB, transfer function must be parametric.
-     *                         (2) Codec Limitations: F16 requires a linear color space.
+     *                         This may not return |prefColorSpace| for
+     *                         specific color types.
      *
      *  Returns the appropriate color space to decode to.
      */
@@ -262,6 +263,23 @@ public:
 
     SkCodec* codec() const { return fCodec.get(); }
 
+    /**
+     *  Retrieve the gainmap for an image.
+     *
+     *  @param outInfo                On success, this is populated with the parameters for
+     *                                rendering this gainmap. This parameter must be non-nullptr.
+     *
+     *  @param outGainmapImageStream  On success, this is populated with a stream from which the
+     *                                gainmap image may be decoded. This parameter is optional, and
+     *                                may be set to nullptr.
+     *
+     *  @return                       If this has a gainmap image and that gainmap image was
+     *                                successfully extracted then return true. Otherwise return
+     *                                false.
+     */
+    bool getAndroidGainmap(SkGainmapInfo* outInfo,
+                           std::unique_ptr<SkStream>* outGainmapImageStream);
+
 protected:
     SkAndroidCodec(SkCodec*);