@shopify/react-native-skia 0.1.212 → 0.1.214

package/android/build.gradle

@@ -113,6 +113,11 @@ buildscript {
 }
 
 android {
+    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+    if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
+      namespace "com.shopify.reactnative.skia"
+    }
+
     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
     buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
     defaultConfig {

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

@@ -16,6 +16,7 @@
 #include "SkColorSpace.h"
 #include "SkSurface.h"
 #include "include/gpu/GrDirectContext.h"
+#include "include/gpu/ganesh/gl/GrGLDirectContext.h"
 #include "include/gpu/gl/GrGLInterface.h"
 
 #pragma clang diagnostic pop
@@ -270,10 +271,10 @@ public:
 
       // Create the Skia context
       auto backendInterface = GrGLMakeNativeInterface();
-      context->directContext = GrDirectContext::MakeGL(backendInterface);
+      context->directContext = GrDirectContexts::MakeGL(backendInterface);
 
       if (context->directContext == nullptr) {
-        RNSkLogger::logToConsole("GrDirectContext::MakeGL failed");
+        RNSkLogger::logToConsole("GrDirectContexts::MakeGL failed");
         return false;
       }
     }

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

@@ -1,6 +1,13 @@
 #include "SkiaOpenGLHelper.h"
 #include <SkiaOpenGLSurfaceFactory.h>
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "include/gpu/ganesh/gl/GrGLBackendSurface.h"
+
+#pragma clang diagnostic pop
+
 namespace RNSkia {
 
 thread_local SkiaOpenGLContext ThreadContextHolder::ThreadSkiaOpenGLContext;
@@ -103,8 +110,8 @@ sk_sp<SkSurface> WindowSurfaceHolder::getSurface() {
       samples = maxSamples;
     }
 
-    GrBackendRenderTarget renderTarget(_width, _height, samples, stencil,
-                                       fboInfo);
+    auto renderTarget = GrBackendRenderTargets::MakeGL(_width, _height, samples,
+                                                       stencil, fboInfo);
 
     SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
 

package/cpp/api/JsiSkSurface.h

@@ -14,6 +14,7 @@
 #pragma clang diagnostic ignored "-Wdocumentation"
 
 #include "SkSurface.h"
+#include "include/gpu/GrDirectContext.h"
 
 #pragma clang diagnostic pop
 
@@ -37,7 +38,9 @@ public:
   }
 
   JSI_HOST_FUNCTION(flush) {
-    getObject()->flush();
+    if (auto dContext = GrAsDirectContext(getObject()->recordingContext())) {
+      dContext->flushAndSubmit();
+    }
     return jsi::Value::undefined();
   }
 

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

@@ -0,0 +1,99 @@
+/*
+ * Copyright 2019 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef GrAHardwareBufferUtils_DEFINED
+#define GrAHardwareBufferUtils_DEFINED
+
+#include "include/core/SkTypes.h"
+
+#if defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26
+
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrTypes.h"
+
+class GrDirectContext;
+
+extern "C" {
+    typedef struct AHardwareBuffer AHardwareBuffer;
+}
+
+namespace GrAHardwareBufferUtils {
+
+SkColorType GetSkColorTypeFromBufferFormat(uint32_t bufferFormat);
+
+#if !defined(SK_DISABLE_LEGACY_ANDROID_HW_UTILS)
+GrBackendFormat GetBackendFormat(GrDirectContext* dContext, AHardwareBuffer* hardwareBuffer,
+                                 uint32_t bufferFormat, bool requireKnownFormat);
+#endif
+
+GrBackendFormat GetGLBackendFormat(GrDirectContext* dContext, uint32_t bufferFormat,
+                                   bool requireKnownFormat);
+GrBackendFormat GetVulkanBackendFormat(GrDirectContext* dContext, AHardwareBuffer* hardwareBuffer,
+                                       uint32_t bufferFormat, bool requireKnownFormat);
+
+typedef void* TexImageCtx;
+typedef void (*DeleteImageProc)(TexImageCtx);
+typedef void (*UpdateImageProc)(TexImageCtx, GrDirectContext*);
+
+/**
+ * Create a GrBackendTexture from AHardwareBuffer
+ *
+ * @param   context         GPU context
+ * @param   hardwareBuffer  AHB
+ * @param   width           texture width
+ * @param   height          texture height
+ * @param   deleteProc      returns a function that deletes the texture and
+ *                          other GPU resources. Must be invoked on the same
+ *                          thread as MakeBackendTexture
+ * @param   updateProc      returns a function, that needs to be invoked, when
+ *                          AHB buffer content has changed. Must be invoked on
+ *                          the same thread as MakeBackendTexture
+ * @param   imageCtx        returns an opaque image context, that is passed as
+ *                          first argument to deleteProc and updateProc
+ * @param   isProtectedContent if true, GL backend uses EXT_protected_content
+ * @param   backendFormat   backend format, usually created with helper
+ *                          function GetBackendFormat
+ * @param   isRenderable    true if GrBackendTexture can be used as a color
+ *                          attachment
+ * @return                  valid GrBackendTexture object on success
+ */
+#if !defined(SK_DISABLE_LEGACY_ANDROID_HW_UTILS)
+GrBackendTexture MakeBackendTexture(GrDirectContext* dContext, AHardwareBuffer* hardwareBuffer,
+                                    int width, int height,
+                                    DeleteImageProc* deleteProc,
+                                    UpdateImageProc* updateProc,
+                                    TexImageCtx* imageCtx,
+                                    bool isProtectedContent,
+                                    const GrBackendFormat& backendFormat,
+                                    bool isRenderable,
+                                    bool fromAndroidWindow = false);
+#endif
+
+GrBackendTexture MakeGLBackendTexture(GrDirectContext* dContext,
+                                      AHardwareBuffer* hardwareBuffer,
+                                      int width, int height,
+                                      DeleteImageProc* deleteProc,
+                                      UpdateImageProc* updateProc,
+                                      TexImageCtx* imageCtx,
+                                      bool isProtectedContent,
+                                      const GrBackendFormat& backendFormat,
+                                      bool isRenderable);
+
+GrBackendTexture MakeVulkanBackendTexture(GrDirectContext* dContext,
+                                          AHardwareBuffer* hardwareBuffer,
+                                          int width, int height,
+                                          DeleteImageProc* deleteProc,
+                                          UpdateImageProc* updateProc,
+                                          TexImageCtx* imageCtx,
+                                          bool isProtectedContent,
+                                          const GrBackendFormat& backendFormat,
+                                          bool isRenderable,
+                                          bool fromAndroidWindow = false);
+
+}  // namespace GrAHardwareBufferUtils
+
+#endif
+#endif

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

@@ -15,15 +15,20 @@ class SkStream;
 
 #include <memory>
 
+// This codec depends on heif libraries that are only part of the Android framework.
+// It will not work on other platforms currently.
+//
+// For historical reasons, this codec also decodes AVIF images.
+// There is a newer, dedicated SkAvifDecoder which could be used instead.
 namespace SkHeifDecoder {
 
-/** Returns true if this data claims to be a HEIF image. */
+/** Returns true if this data claims to be a HEIF (or AVIF) image. */
 SK_API bool IsHeif(const void*, size_t);
 
 /**
- *  Attempts to decode the given bytes as a HEIF.
+ *  Attempts to decode the given bytes as a HEIF (or AVIF).
  *
- *  If the bytes are not a HEIF, returns nullptr.
+ *  If the bytes are not a HEIF (or AVIF), returns nullptr.
  *
  *  DecodeContext is treated as a SkCodec::SelectionPolicy*
  */
@@ -34,6 +39,8 @@ SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
 
+// Do not register this codec using "avif" as the key (even though it can handle that type).
+// Doing so would cause internal codec sniffing to choose the wrong sampler.
 inline SkCodecs::Decoder Decoder() {
     return { "heif", IsHeif, Decode };
 }

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

@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -821,7 +821,7 @@ protected:
      *  This is called by getPixels(), getYUV8Planes(), startIncrementalDecode() and
      *  startScanlineDecode(). Subclasses may call if they need to rewind at another time.
      */
-    bool SK_WARN_UNUSED_RESULT rewindIfNeeded();
+    [[nodiscard]] bool rewindIfNeeded();
 
     /**
      *  Called by rewindIfNeeded, if the stream needed to be rewound.
@@ -1008,6 +1008,7 @@ private:
     virtual SkSampler* getSampler(bool /*createIfNecessary*/) { return nullptr; }
 
     friend class DM::CodecSrc;  // for fillIncompleteImage
+    friend class PNGCodecGM;    // for fillIncompleteImage
     friend class SkSampledCodec;
     friend class SkIcoCodec;
     friend class SkAndroidCodec; // for fEncodedInfo
@@ -1021,7 +1022,7 @@ using MakeFromStreamCallback = std::unique_ptr<SkCodec> (*)(std::unique_ptr<SkSt
                                                             SkCodec::Result*,
                                                             DecodeContext);
 
-struct Decoder {
+struct SK_API Decoder {
     // By convention, we use all lowercase letters and go with the primary filename extension.
     // For example "png", "jpg", "ico", "webp", etc
     std::string id;
@@ -1033,7 +1034,7 @@ struct Decoder {
 // SkCodec::MakeFromStream. If a decoder with the same id already exists, this new decoder
 // will replace the existing one (in the same position). This is not thread-safe, so make sure all
 // initialization is done before the first call.
-void Register(Decoder d);
+void SK_API Register(Decoder d);
 }
 
 #endif // SkCodec_DEFINED

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

@@ -14,9 +14,6 @@
  *  Enum describing format of encoded data.
  */
 enum class SkEncodedImageFormat {
-#ifdef SK_BUILD_FOR_GOOGLE3
-    kUnknown,
-#endif
     kBMP,
     kGIF,
     kICO,

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

@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,6 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 class SkData;
 class SkStream;

package/cpp/skia/include/config/SkUserConfig.h

@@ -99,8 +99,6 @@
    Skia consumers can provide their own definitions of these macros to
    integrate with their own compilers and build system.
 */
-//#define SK_UNUSED [[maybe_unused]]
-//#define SK_WARN_UNUSED_RESULT [[nodiscard]]
 //#define SK_ALWAYS_INLINE inline __attribute__((always_inline))
 //#define SK_NEVER_INLINE __attribute__((noinline))
 //#define SK_PRINTF_LIKE(A, B) __attribute__((format(printf, (A), (B))))

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

@@ -33,7 +33,7 @@ class SkPixelRef;
 class SkShader;
 enum SkColorType : int;
 enum class SkTileMode;
-struct SkMask;
+struct SkMaskBuilder;
 
 /** \class SkBitmap
     SkBitmap describes a two-dimensional raster pixel array. SkBitmap is built on
@@ -440,7 +440,7 @@ public:
         @param flags  kZeroPixels_AllocFlag, or zero
         @return       true if pixels allocation is successful
     */
-    bool SK_WARN_UNUSED_RESULT tryAllocPixelsFlags(const SkImageInfo& info, uint32_t flags);
+    [[nodiscard]] bool tryAllocPixelsFlags(const SkImageInfo& info, uint32_t flags);
 
     /** Sets SkImageInfo to info following the rules in setInfo() and allocates pixel
         memory. Memory is zeroed.
@@ -478,7 +478,7 @@ public:
         @param rowBytes  size of pixel row or larger; may be zero
         @return          true if pixel storage is allocated
     */
-    bool SK_WARN_UNUSED_RESULT tryAllocPixels(const SkImageInfo& info, size_t rowBytes);
+    [[nodiscard]] bool tryAllocPixels(const SkImageInfo& info, size_t rowBytes);
 
     /** Sets SkImageInfo to info following the rules in setInfo() and allocates pixel
         memory. rowBytes must equal or exceed info.width() times info.bytesPerPixel(),
@@ -514,7 +514,7 @@ public:
         @param info  contains width, height, SkAlphaType, SkColorType, SkColorSpace
         @return      true if pixel storage is allocated
     */
-    bool SK_WARN_UNUSED_RESULT tryAllocPixels(const SkImageInfo& info) {
+    [[nodiscard]] bool tryAllocPixels(const SkImageInfo& info) {
         return this->tryAllocPixels(info, info.minRowBytes());
     }
 
@@ -553,7 +553,7 @@ public:
         @param isOpaque  true if pixels do not have transparency
         @return          true if pixel storage is allocated
     */
-    bool SK_WARN_UNUSED_RESULT tryAllocN32Pixels(int width, int height, bool isOpaque = false);
+    [[nodiscard]] bool tryAllocN32Pixels(int width, int height, bool isOpaque = false);
 
     /** Sets SkImageInfo to width, height, and the native color type; and allocates
         pixel memory. If isOpaque is true, sets SkImageInfo to kOpaque_SkAlphaType;
@@ -637,7 +637,7 @@ public:
 
     /** Deprecated.
     */
-    bool installMaskPixels(const SkMask& mask);
+    bool installMaskPixels(SkMaskBuilder& mask);
 
     /** Replaces SkPixelRef with pixels, preserving SkImageInfo and rowBytes().
         Sets SkPixelRef origin to (0, 0).
@@ -661,7 +661,7 @@ public:
 
         @return  true if the allocation succeeds
     */
-    bool SK_WARN_UNUSED_RESULT tryAllocPixels() {
+    [[nodiscard]] bool tryAllocPixels() {
         return this->tryAllocPixels((Allocator*)nullptr);
     }
 
@@ -685,7 +685,7 @@ public:
         @param allocator  instance of SkBitmap::Allocator instantiation
         @return           true if custom allocator reports success
     */
-    bool SK_WARN_UNUSED_RESULT tryAllocPixels(Allocator* allocator);
+    [[nodiscard]] bool tryAllocPixels(Allocator* allocator);
 
     /** Allocates pixel memory with allocator, and replaces existing SkPixelRef.
         The allocation size is determined by SkImageInfo width, height, and SkColorType.