@shopify/react-native-skia 0.1.192 → 0.1.193

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

@@ -13,10 +13,11 @@
 #include "include/core/SkTypes.h"
 
 class SkDeferredDisplayListPriv;
+class SkPromiseImageTexture;
 
-#if SK_SUPPORT_GPU
+#if defined(SK_GANESH)
 #include "include/gpu/GrRecordingContext.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
 #include <map>
 class GrRenderTask;
 class GrRenderTargetProxy;
@@ -36,7 +37,7 @@ public:
         return fCharacterization;
     }
 
-#if SK_SUPPORT_GPU
+#if defined(SK_GANESH)
     /**
      * Iterate through the programs required by the DDL.
      */
@@ -52,7 +53,7 @@ public:
 
     private:
         GrDirectContext*                                 fDContext;
-        const SkTArray<GrRecordingContext::ProgramData>& fProgramData;
+        const skia_private::TArray<GrRecordingContext::ProgramData>& fProgramData;
         int                                              fIndex;
     };
 #endif
@@ -70,7 +71,7 @@ private:
     // texture when the DDL is replayed. It has to be separately ref counted bc the lazy proxy
     // can outlive the DDL.
     class LazyProxyData : public SkRefCnt {
-#if SK_SUPPORT_GPU
+#if defined(SK_GANESH)
     public:
         // Upon being replayed - this field will be filled in (by the DrawingManager) with the
         // proxy backing the destination SkSurface. Note that, since there is no good place to
@@ -87,21 +88,21 @@ private:
                                  sk_sp<GrRenderTargetProxy> fTargetProxy,
                                  sk_sp<LazyProxyData>);
 
-#if SK_SUPPORT_GPU
-    const SkTArray<GrRecordingContext::ProgramData>& programData() const {
+#if defined(SK_GANESH)
+    const skia_private::TArray<GrRecordingContext::ProgramData>& programData() const {
         return fProgramData;
     }
 #endif
 
     const SkSurfaceCharacterization fCharacterization;
 
-#if SK_SUPPORT_GPU
+#if defined(SK_GANESH)
     // These are ordered such that the destructor cleans op tasks up first (which may refer back
     // to the arena and memory pool in their destructors).
     GrRecordingContext::OwnedArenas fArenas;
-    SkTArray<sk_sp<GrRenderTask>>   fRenderTasks;
+    skia_private::TArray<sk_sp<GrRenderTask>>   fRenderTasks;
 
-    SkTArray<GrRecordingContext::ProgramData> fProgramData;
+    skia_private::TArray<GrRecordingContext::ProgramData> fProgramData;
     sk_sp<GrRenderTargetProxy>      fTargetProxy;
     sk_sp<LazyProxyData>            fLazyProxyData;
 #endif

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

@@ -50,13 +50,14 @@ public:
 
     sk_sp<SkDeferredDisplayList> detach();
 
-#if SK_SUPPORT_GPU
-    using PromiseImageTextureContext     = SkImage::PromiseImageTextureContext;
-    using PromiseImageTextureFulfillProc = SkImage::PromiseImageTextureFulfillProc;
-    using PromiseImageTextureReleaseProc = SkImage::PromiseImageTextureReleaseProc;
+#if defined(SK_GANESH)
+    using PromiseImageTextureContext = void*;
+    using PromiseImageTextureFulfillProc =
+            sk_sp<SkPromiseImageTexture> (*)(PromiseImageTextureContext);
+    using PromiseImageTextureReleaseProc = void (*)(PromiseImageTextureContext);
 
 #ifndef SK_MAKE_PROMISE_TEXTURE_DISABLE_LEGACY_API
-    /** Deprecated: Use SkImage::MakePromiseTexture instead. */
+    /** Deprecated: Use SkImages::PromiseTextureFrom instead. */
     sk_sp<SkImage> makePromiseTexture(const GrBackendFormat& backendFormat,
                                       int width,
                                       int height,
@@ -69,14 +70,14 @@ public:
                                       PromiseImageTextureReleaseProc textureReleaseProc,
                                       PromiseImageTextureContext textureContext);
 
-    /** Deprecated: Use SkImage::MakePromiseYUVATexture instead. */
+    /** Deprecated: Use SkImages::PromiseTextureFromYUVA instead. */
     sk_sp<SkImage> makeYUVAPromiseTexture(const GrYUVABackendTextureInfo& yuvaBackendTextureInfo,
                                           sk_sp<SkColorSpace> imageColorSpace,
                                           PromiseImageTextureFulfillProc textureFulfillProc,
                                           PromiseImageTextureReleaseProc textureReleaseProc,
                                           PromiseImageTextureContext textureContexts[]);
 #endif // SK_MAKE_PROMISE_TEXTURE_DISABLE_LEGACY_API
-#endif // SK_SUPPORT_GPU
+#endif // defined(SK_GANESH)
 
 private:
     SkDeferredDisplayListRecorder(const SkDeferredDisplayListRecorder&) = delete;
@@ -86,7 +87,7 @@ private:
 
     const SkSurfaceCharacterization             fCharacterization;
 
-#if SK_SUPPORT_GPU
+#if defined(SK_GANESH)
     sk_sp<GrRecordingContext>                   fContext;
     sk_sp<GrRenderTargetProxy>                  fTargetProxy;
     sk_sp<SkDeferredDisplayList::LazyProxyData> fLazyProxyData;

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

@@ -9,14 +9,22 @@
 #define SkDrawable_DEFINED
 
 #include "include/core/SkFlattenable.h"
-#include "include/core/SkImageInfo.h"
+#include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
+#include "include/private/base/SkAPI.h"
+
+#include <cstddef>
+#include <cstdint>
+#include <memory>
 
 class GrBackendDrawableInfo;
 class SkCanvas;
 class SkMatrix;
 class SkPicture;
-enum class GrBackendApi : unsigned;
+enum class GrBackendApi : unsigned int;
+struct SkDeserialProcs;
+struct SkIRect;
+struct SkImageInfo;
 struct SkRect;
 
 /**

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

@@ -1,36 +1,9 @@
 /*
- * Copyright 2015 Google Inc.
+ * 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 SkEncodedImageFormat_DEFINED
-#define SkEncodedImageFormat_DEFINED
-
-#include <stdint.h>
-
-/**
- *  Enum describing format of encoded data.
- */
-enum class SkEncodedImageFormat {
-#ifdef SK_BUILD_FOR_GOOGLE3
-    kUnknown,
-#endif
-    kBMP,
-    kGIF,
-    kICO,
-    kJPEG,
-    kPNG,
-    kWBMP,
-    kWEBP,
-    kPKM,
-    kKTX,
-    kASTC,
-    kDNG,
-    kHEIF,
-    kAVIF,
-    kJPEGXL,
-};
-
-#endif  // SkEncodedImageFormat_DEFINED
+// 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/SkFlattenable.h

@@ -9,13 +9,15 @@
 #define SkFlattenable_DEFINED
 
 #include "include/core/SkRefCnt.h"
+#include "include/core/SkTypes.h"
+
+#include <cstddef>
 
 class SkData;
 class SkReadBuffer;
 class SkWriteBuffer;
-
-struct SkSerialProcs;
 struct SkDeserialProcs;
+struct SkSerialProcs;
 
 /** \class SkFlattenable
 

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

@@ -11,6 +11,7 @@
 #include "include/core/SkFontTypes.h"
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypeface.h"
+#include "include/private/base/SkTemplates.h"
 
 #include <vector>
 

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

@@ -9,6 +9,7 @@
 #define SkFontMetrics_DEFINED
 
 #include "include/core/SkScalar.h"
+#include "include/private/base/SkTo.h"
 
 /** \class SkFontMetrics
     The metrics of an SkFont.

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

@@ -13,6 +13,8 @@
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkTypes.h"
 
+#include <memory>
+
 class SkData;
 class SkFontData;
 class SkStreamAsset;
@@ -23,23 +25,20 @@ class SK_API SkFontStyleSet : public SkRefCnt {
 public:
     virtual int count() = 0;
     virtual void getStyle(int index, SkFontStyle*, SkString* style) = 0;
-    virtual SkTypeface* createTypeface(int index) = 0;
-    virtual SkTypeface* matchStyle(const SkFontStyle& pattern) = 0;
+    virtual sk_sp<SkTypeface> createTypeface(int index) = 0;
+    virtual sk_sp<SkTypeface> matchStyle(const SkFontStyle& pattern) = 0;
 
-    static SkFontStyleSet* CreateEmpty();
+    static sk_sp<SkFontStyleSet> CreateEmpty();
 
 protected:
-    SkTypeface* matchStyleCSS3(const SkFontStyle& pattern);
-
-private:
-    using INHERITED = SkRefCnt;
+    sk_sp<SkTypeface> matchStyleCSS3(const SkFontStyle& pattern);
 };
 
 class SK_API SkFontMgr : public SkRefCnt {
 public:
     int countFamilies() const;
     void getFamilyName(int index, SkString* familyName) const;
-    SkFontStyleSet* createStyleSet(int index) const;
+    sk_sp<SkFontStyleSet> createStyleSet(int index) const;
 
     /**
      *  The caller must call unref() on the returned object.
@@ -52,7 +51,7 @@ public:
      *  It is possible that this will return a style set not accessible from
      *  createStyleSet(int) due to hidden or auto-activated fonts.
      */
-    SkFontStyleSet* matchFamily(const char familyName[]) const;
+    sk_sp<SkFontStyleSet> matchFamily(const char familyName[]) const;
 
     /**
      *  Find the closest matching typeface to the specified familyName and style
@@ -66,7 +65,7 @@ public:
      *  createStyleSet(int) or matchFamily(const char[]) due to hidden or
      *  auto-activated fonts.
      */
-    SkTypeface* matchFamilyStyle(const char familyName[], const SkFontStyle&) const;
+    sk_sp<SkTypeface> matchFamilyStyle(const char familyName[], const SkFontStyle&) const;
 
     /**
      *  Use the system fallback to find a typeface for the given character.
@@ -83,9 +82,9 @@ public:
      *  most significant. If no specified bcp47 codes match, any font with the
      *  requested character will be matched.
      */
-    SkTypeface* matchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,
-                                          const char* bcp47[], int bcp47Count,
-                                          SkUnichar character) const;
+    sk_sp<SkTypeface> matchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,
+                                                const char* bcp47[], int bcp47Count,
+                                                SkUnichar character) const;
 
     /**
      *  Create a typeface for the specified data and TTC index (pass 0 for none)
@@ -123,16 +122,17 @@ public:
 protected:
     virtual int onCountFamilies() const = 0;
     virtual void onGetFamilyName(int index, SkString* familyName) const = 0;
-    virtual SkFontStyleSet* onCreateStyleSet(int index)const  = 0;
+    virtual sk_sp<SkFontStyleSet> onCreateStyleSet(int index)const  = 0;
 
     /** May return NULL if the name is not found. */
-    virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const = 0;
+    virtual sk_sp<SkFontStyleSet> onMatchFamily(const char familyName[]) const = 0;
 
-    virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
-                                           const SkFontStyle&) const = 0;
-    virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,
-                                                    const char* bcp47[], int bcp47Count,
-                                                    SkUnichar character) const = 0;
+    virtual sk_sp<SkTypeface> onMatchFamilyStyle(const char familyName[],
+                                                 const SkFontStyle&) const = 0;
+    virtual sk_sp<SkTypeface> onMatchFamilyStyleCharacter(const char familyName[],
+                                                          const SkFontStyle&,
+                                                          const char* bcp47[], int bcp47Count,
+                                                          SkUnichar character) const = 0;
 
     virtual sk_sp<SkTypeface> onMakeFromData(sk_sp<SkData>, int ttcIndex) const = 0;
     virtual sk_sp<SkTypeface> onMakeFromStreamIndex(std::unique_ptr<SkStreamAsset>,
@@ -143,18 +143,9 @@ protected:
 
     virtual sk_sp<SkTypeface> onLegacyMakeTypeface(const char familyName[], SkFontStyle) const = 0;
 
-    // this method is never called -- will be removed
-    virtual SkTypeface* onMatchFaceStyle(const SkTypeface*,
-                                         const SkFontStyle&) const {
-        return nullptr;
-    }
-
 private:
-
     /** Implemented by porting layer to return the default factory. */
     static sk_sp<SkFontMgr> Factory();
-
-    using INHERITED = SkRefCnt;
 };
 
 #endif

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

@@ -9,7 +9,9 @@
 #define SkFontStyle_DEFINED
 
 #include "include/core/SkTypes.h"
-#include "include/private/SkTPin.h"
+#include "include/private/base/SkTPin.h"
+
+#include <cstdint>
 
 class SK_API SkFontStyle {
 public:
@@ -75,6 +77,7 @@ public:
     }
 
 private:
+    friend class SkTypefaceProxyPrototype;  // To serialize fValue
     int32_t fValue;
 };
 

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

@@ -10,9 +10,12 @@
 
 #include "include/core/SkRefCnt.h"
 
+#include <memory>
+
 class SkData;
 class SkImageGenerator;
 class SkOpenTypeSVGDecoder;
+class SkPath;
 class SkTraceMemoryDump;
 
 class SK_API SkGraphics {
@@ -115,16 +118,6 @@ public:
      */
     static void PurgeAllCaches();
 
-    /**
-     *  Applications with command line options may pass optional state, such
-     *  as cache sizes, here, for instance:
-     *  font-cache-limit=12345678
-     *
-     *  The flags format is name=value[;name=value...] with no spaces.
-     *  This format is subject to change.
-     */
-    static void SetFlags(const char* flags);
-
     typedef std::unique_ptr<SkImageGenerator>
                                             (*ImageGeneratorFromEncodedDataFactory)(sk_sp<SkData>);
 
@@ -151,18 +144,28 @@ public:
     static OpenTypeSVGDecoderFactory GetOpenTypeSVGDecoderFactory();
 
     /**
-     *  Temporarily (until variable COLRv1 is released) pass a feature switch function for whether
-     *  variable COLRv1 is enabled. Needed for initializing FreeType with a property setting so that
-     *  variable COLRv1 can be enabled in Chrome Canaries during development.
+     *  Call early in main() to allow Skia to use a JIT to accelerate CPU-bound operations.
      */
-    using VariableColrV1EnabledFunc = bool (*)();
-    static VariableColrV1EnabledFunc SetVariableColrV1EnabledFunc(VariableColrV1EnabledFunc);
-    static bool GetVariableColrV1Enabled();
+    static void AllowJIT();
 
     /**
-     *  Call early in main() to allow Skia to use a JIT to accelerate CPU-bound operations.
+     *  To override the default AA algorithm choice in the CPU backend, provide a function that
+     *  returns whether to use analytic (true) or supersampled (false) for a given path.
+     *
+     *  NOTE: This is a temporary API, intended for migration of all clients to one algorithm,
+     *        and should not be used.
      */
-    static void AllowJIT();
+    typedef bool (*PathAnalyticAADeciderProc)(const SkPath&);
+    static void SetPathAnalyticAADecider(PathAnalyticAADeciderProc);
+
+    /*
+     *  Similar to above, but simply forces the CPU backend to always use analytic AA.
+     *
+     *  NOTE: This is a temporary API, intended for migration of all clients to one algorithm.
+     *        If the PathAnalyticAADeciderProc is *also* set, this setting has no effect.
+     *        Unlike that API, this function is thread-safe.
+     */
+    static void SetForceAnalyticAA(bool);
 };
 
 class SkAutoGraphics {

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

@@ -1,19 +1,9 @@
 /*
- * Copyright 2016 Google Inc.
+ * 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 SkICC_DEFINED
-#define SkICC_DEFINED
-
-#include "include/core/SkData.h"
-
-struct skcms_Matrix3x3;
-struct skcms_TransferFunction;
-
-SK_API sk_sp<SkData> SkWriteICCProfile(const skcms_TransferFunction&,
-                                       const skcms_Matrix3x3& toXYZD50);
-
-#endif//SkICC_DEFINED
+// TODO(kjlubick) remove this shim after clients have been moved to the new location
+#include "include/encode/SkICC.h" // IWYU pragma: export