@shopify/react-native-skia 0.1.158 → 0.1.160

package/cpp/skia/include/utils/SkEventTracer.h

@@ -18,6 +18,8 @@
 
 #include "include/core/SkTypes.h"
 
+#include <cstdint>
+
 class SK_API SkEventTracer {
 public:
 
@@ -27,8 +29,14 @@ public:
      * If this is the first call to SetInstance or GetInstance then the passed instance is
      * installed and true is returned. Otherwise, false is returned. In either case ownership of the
      * tracer is transferred and it will be deleted when no longer needed.
+     *
+     * Not deleting the tracer on process exit should not cause problems as
+     * the whole heap is about to go away with the process. This can also
+     * improve performance by reducing the amount of work needed.
+     *
+     * @param leakTracer Do not delete tracer on process exit.
      */
-    static bool SetInstance(SkEventTracer*);
+    static bool SetInstance(SkEventTracer*, bool leakTracer = false);
 
     /**
      * Gets the event tracer. If this is the first call to SetInstance or GetIntance then a default
@@ -70,6 +78,9 @@ public:
                                  const char* name,
                                  SkEventTracer::Handle handle) = 0;
 
+    // Optional method that can be implemented to allow splitting up traces into different sections.
+    virtual void newTracingSection(const char*) {}
+
 protected:
     SkEventTracer() = default;
     SkEventTracer(const SkEventTracer&) = delete;

package/cpp/skia/include/utils/SkNWayCanvas.h

@@ -22,9 +22,14 @@
 #include "include/private/SkTDArray.h"
 #include "include/utils/SkNoDrawCanvas.h"
 
+#include <cstddef>
+
+namespace sktext {
+class GlyphRunList;
+}
+
 class SkData;
 class SkDrawable;
-class SkGlyphRunList;
 class SkImage;
 class SkMatrix;
 class SkPaint;
@@ -41,7 +46,9 @@ struct SkRSXform;
 struct SkRect;
 
 #if SK_SUPPORT_GPU
-class GrSlug;
+namespace sktext::gpu {
+class Slug;
+}
 #endif
 
 class SK_API SkNWayCanvas : public SkCanvasVirtualEnforcer<SkNoDrawCanvas> {
@@ -67,11 +74,11 @@ protected:
     void didTranslate(SkScalar, SkScalar) override;
 
     void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override;
-    void onDrawGlyphRunList(const SkGlyphRunList&, const SkPaint&) override;
+    void onDrawGlyphRunList(const sktext::GlyphRunList&, const SkPaint&) override;
     void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
                         const SkPaint& paint) override;
 #if SK_SUPPORT_GPU
-    void onDrawSlug(const GrSlug* slug) override;
+    void onDrawSlug(const sktext::gpu::Slug* slug) override;
 #endif
     void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
                      const SkPoint texCoords[4], SkBlendMode, const SkPaint& paint) override;

package/cpp/skia/include/utils/SkPaintFilterCanvas.h

@@ -21,10 +21,15 @@
 #include "include/private/SkTDArray.h"
 #include "include/utils/SkNWayCanvas.h"
 
+#include <cstddef>
+
+namespace sktext {
+class GlyphRunList;
+}
+
 class GrRecordingContext;
 class SkData;
 class SkDrawable;
-class SkGlyphRunList;
 class SkImage;
 class SkMatrix;
 class SkPaint;
@@ -103,7 +108,7 @@ protected:
     void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
     void onDrawDrawable(SkDrawable*, const SkMatrix*) override;
 
-    void onDrawGlyphRunList(const SkGlyphRunList&, const SkPaint&) override;
+    void onDrawGlyphRunList(const sktext::GlyphRunList&, const SkPaint&) override;
     void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
                         const SkPaint& paint) override;
     void onDrawAnnotation(const SkRect& rect, const char key[], SkData* value) override;
@@ -119,12 +124,12 @@ protected:
     bool onPeekPixels(SkPixmap* pixmap) override;
     bool onAccessTopLayerPixels(SkPixmap* pixmap) override;
     SkImageInfo onImageInfo() const override;
-    bool onGetProps(SkSurfaceProps* props) const override;
+    bool onGetProps(SkSurfaceProps* props, bool top) const override;
 
 private:
     class AutoPaintFilter;
 
-    SkCanvas* proxy() const { SkASSERT(fList.count() == 1); return fList[0]; }
+    SkCanvas* proxy() const { SkASSERT(fList.size() == 1); return fList[0]; }
 
     SkPaintFilterCanvas* internal_private_asPaintFilterCanvas() const override {
         return const_cast<SkPaintFilterCanvas*>(this);

package/cpp/skia/include/utils/SkParse.h

@@ -14,6 +14,9 @@
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
 
+#include <cstddef>
+#include <cstdint>
+
 class SK_API SkParse {
 public:
     static int Count(const char str[]); // number of scalars or int values

package/cpp/skia/include/utils/SkShadowUtils.h

@@ -13,6 +13,8 @@
 #include "include/core/SkTypes.h"
 #include "include/private/SkShadowFlags.h"
 
+#include <cstdint>
+
 class SkCanvas;
 class SkMatrix;
 class SkPath;

package/cpp/skia/include/utils/SkTextUtils.h

@@ -12,7 +12,8 @@
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
 
-#include <string.h>
+#include <cstddef>
+#include <string>
 
 class SkCanvas;
 class SkFont;

package/cpp/skia/{include/third_party → modules}/skcms/skcms.h

@@ -152,6 +152,12 @@ typedef struct skcms_B2A {
     skcms_Curve     output_curves[4];
 } skcms_B2A;
 
+typedef struct skcms_CICP {
+    uint8_t color_primaries;
+    uint8_t transfer_characteristics;
+    uint8_t matrix_coefficients;
+    uint8_t video_full_range_flag;
+} skcms_CICP;
 
 typedef struct skcms_ICCProfile {
     const uint8_t* buffer;
@@ -185,6 +191,10 @@ typedef struct skcms_ICCProfile {
     bool                   has_B2A;
     skcms_B2A              B2A;
 
+    // If the profile has a valid CICP tag, skcms_Parse() sets CICP to that data,
+    // and has_CICP to true.
+    bool                   has_CICP;
+    skcms_CICP             CICP;
 } skcms_ICCProfile;
 
 // The sRGB color profile is so commonly used that we offer a canonical skcms_ICCProfile for it.

package/cpp/skia/modules/skcms/skcms_internal.h

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#pragma once
+
+// skcms_internal.h contains APIs shared by skcms' internals and its test tools.
+// Please don't use this header from outside the skcms repo.
+
+#include "skcms.h"
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// ~~~~ General Helper Macros ~~~~
+    #define ARRAY_COUNT(arr) (int)(sizeof((arr)) / sizeof(*(arr)))
+
+    typedef struct skcms_ICCTag {
+        uint32_t       signature;
+        uint32_t       type;
+        uint32_t       size;
+        const uint8_t* buf;
+    } skcms_ICCTag;
+
+    void skcms_GetTagByIndex    (const skcms_ICCProfile*, uint32_t idx, skcms_ICCTag*);
+    bool skcms_GetTagBySignature(const skcms_ICCProfile*, uint32_t sig, skcms_ICCTag*);
+
+    float skcms_MaxRoundtripError(const skcms_Curve* curve, const skcms_TransferFunction* inv_tf);
+
+    // 252 of a random shuffle of all possible bytes.
+    // 252 is evenly divisible by 3 and 4.  Only 192, 10, 241, and 43 are missing.
+    // Used for ICC profile equivalence testing.
+    extern const uint8_t skcms_252_random_bytes[252];
+
+// ~~~~ Portable Math ~~~~
+    static inline float floorf_(float x) {
+        float roundtrip = (float)((int)x);
+        return roundtrip > x ? roundtrip - 1 : roundtrip;
+    }
+    static inline float fabsf_(float x) { return x < 0 ? -x : x; }
+    float powf_(float, float);
+
+// ~~~~ Does this pixel format need a palette pointer to be usable? ~~~~
+    static inline bool needs_palette(skcms_PixelFormat fmt) {
+        return (fmt >> 1) == (skcms_PixelFormat_RGBA_8888_Palette8 >> 1);
+    }
+
+#ifdef __cplusplus
+}
+#endif