@shopify/react-native-skia 1.11.18 → 1.12.1

package/android/cpp/jni/JniPlatformContext.cpp

@@ -162,6 +162,7 @@ void JniPlatformContext::performStreamOperation(
         jni::Environment::current()->GetByteArrayElements(array.get(), nullptr);
     if (!elements) {
       printf("Element Fail\n");
+      free(buffer);
       return;
     }
 

package/cpp/api/JsiSkContourMeasure.h

@@ -34,7 +34,7 @@ public:
     SkPoint tangent;
     auto result = getObject()->getPosTan(dist, &position, &tangent);
     if (!result) {
-      throw jsi::JSError(runtime, "getSegment() failed");
+      throw jsi::JSError(runtime, "getPosTan() failed");
     }
     auto posTan = jsi::Array(runtime, 2);
     auto pos = jsi::Object::createFromHostObject(

package/cpp/api/JsiSkHostObjects.h

@@ -54,20 +54,21 @@ public:
 
   /**
    * Returns the underlying object exposed by this host object. This object
-   * should be wrapped in a shared pointer of some kind
+   * should be wrapped in a shared pointer of some kind.
+   * Throws if the object has been disposed.
    * @return Underlying object
    */
-  T getObject() { return _object; }
-  const T getObject() const { return _object; }
+  T getObject() { return validateObject(); }
+  const T getObject() const { return validateObject(); }
 
   /**
-   Updates the inner object with a new version of the object.
+   * Updates the inner object with a new version of the object.
    */
   void setObject(T object) { _object = object; }
 
   /**
-   Dispose function that can be exposed to JS by using the JSI_API_TYPENAME
-   macro
+   * Dispose function that can be exposed to JS by using the JSI_API_TYPENAME
+   * macro.
    */
   JSI_HOST_FUNCTION(dispose) {
     safeDispose();
@@ -76,12 +77,22 @@ public:
 
 protected:
   /**
-   Override to implement disposale of allocated resources like smart pointers
-   etc. This method will only be called once for each instance of this class.
+   * Override to implement disposal of allocated resources like smart pointers.
+   * This method will only be called once for each instance of this class.
    */
   virtual void releaseResources() = 0;
 
 private:
+  /**
+   * Validates that _object was not disposed and returns it.
+   */
+  T validateObject() const {
+    if (_isDisposed) {
+      throw std::runtime_error("Attempted to access a disposed object.");
+    }
+    return _object;
+  }
+
   void safeDispose() {
     if (!_isDisposed) {
       _isDisposed = true;
@@ -90,12 +101,12 @@ private:
   }
 
   /**
-   * Wrapped object
+   * Wrapped object.
    */
   T _object;
 
   /**
-   Resource disposed flag
+   * Resource disposed flag.
    */
   std::atomic<bool> _isDisposed = {false};
 };

package/cpp/api/JsiSkParagraph.h

@@ -24,19 +24,19 @@
 namespace RNSkia {
 
 namespace jsi = facebook::jsi;
-
 namespace para = skia::textlayout;
 
 /**
- Implementation of the Paragraph object in JSI
+ * Implementation of the Paragraph object in JSI
  */
-class JsiSkParagraph : public JsiSkHostObject {
+class JsiSkParagraph
+    : public JsiSkWrappingSharedPtrHostObject<para::Paragraph> {
 public:
   EXPORT_JSI_API_TYPENAME(JsiSkParagraph, Paragraph)
 
   JSI_HOST_FUNCTION(layout) {
     auto width = getArgumentAsNumber(runtime, arguments, count, 0);
-    _paragraph->layout(width);
+    getObject()->layout(width);
     return jsi::Value::undefined();
   }
 
@@ -45,34 +45,34 @@ public:
         getArgumentAsHostObject<JsiSkCanvas>(runtime, arguments, count, 0);
     auto x = getArgumentAsNumber(runtime, arguments, count, 1);
     auto y = getArgumentAsNumber(runtime, arguments, count, 2);
-    _paragraph->paint(jsiCanvas->getCanvas(), x, y);
+    getObject()->paint(jsiCanvas->getCanvas(), x, y);
     return jsi::Value::undefined();
   }
 
   JSI_HOST_FUNCTION(getHeight) {
-    return static_cast<double>(_paragraph->getHeight());
+    return static_cast<double>(getObject()->getHeight());
   }
 
   JSI_HOST_FUNCTION(getMaxWidth) {
-    return static_cast<double>(_paragraph->getMaxWidth());
+    return static_cast<double>(getObject()->getMaxWidth());
   }
 
   JSI_HOST_FUNCTION(getMaxIntrinsicWidth) {
-    return static_cast<double>(_paragraph->getMaxIntrinsicWidth());
+    return static_cast<double>(getObject()->getMaxIntrinsicWidth());
   }
 
   JSI_HOST_FUNCTION(getMinIntrinsicWidth) {
-    return static_cast<double>(_paragraph->getMinIntrinsicWidth());
+    return static_cast<double>(getObject()->getMinIntrinsicWidth());
   }
 
   JSI_HOST_FUNCTION(getLongestLine) {
-    return static_cast<double>(_paragraph->getLongestLine());
+    return static_cast<double>(getObject()->getLongestLine());
   }
 
   JSI_HOST_FUNCTION(getGlyphPositionAtCoordinate) {
     auto dx = getArgumentAsNumber(runtime, arguments, count, 0);
     auto dy = getArgumentAsNumber(runtime, arguments, count, 1);
-    auto result = _paragraph->getGlyphPositionAtCoordinate(dx, dy);
+    auto result = getObject()->getGlyphPositionAtCoordinate(dx, dy);
     return result.position;
   }
 
@@ -80,8 +80,8 @@ public:
     auto start = getArgumentAsNumber(runtime, arguments, count, 0);
     auto end = getArgumentAsNumber(runtime, arguments, count, 1);
     auto result =
-        _paragraph->getRectsForRange(start, end, para::RectHeightStyle::kTight,
-                                     para::RectWidthStyle::kTight);
+        getObject()->getRectsForRange(start, end, para::RectHeightStyle::kTight,
+                                      para::RectWidthStyle::kTight);
     auto returnValue = jsi::Array(runtime, result.size());
     for (size_t i = 0; i < result.size(); ++i) {
       returnValue.setValueAtIndex(
@@ -93,7 +93,7 @@ public:
 
   JSI_HOST_FUNCTION(getLineMetrics) {
     std::vector<para::LineMetrics> metrics;
-    _paragraph->getLineMetrics(metrics);
+    getObject()->getLineMetrics(metrics);
     auto returnValue = jsi::Array(runtime, metrics.size());
     auto height = 0;
     for (size_t i = 0; i < metrics.size(); ++i) {
@@ -110,7 +110,7 @@ public:
 
   JSI_HOST_FUNCTION(getRectsForPlaceholders) {
     std::vector<para::TextBox> placeholderInfos =
-        _paragraph->getRectsForPlaceholders();
+        getObject()->getRectsForPlaceholders();
     auto returnValue = jsi::Array(runtime, placeholderInfos.size());
     for (size_t i = 0; i < placeholderInfos.size(); ++i) {
       auto obj = jsi::Object(runtime);
@@ -124,12 +124,6 @@ public:
     return returnValue;
   }
 
-  JSI_HOST_FUNCTION(dispose) {
-    _paragraph = nullptr;
-
-    return jsi::Value::undefined();
-  }
-
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkParagraph, layout),
                        JSI_EXPORT_FUNC(JsiSkParagraph, paint),
                        JSI_EXPORT_FUNC(JsiSkParagraph, getMaxWidth),
@@ -146,12 +140,8 @@ public:
 
   explicit JsiSkParagraph(std::shared_ptr<RNSkPlatformContext> context,
                           para::ParagraphBuilder *paragraphBuilder)
-      : JsiSkHostObject(std::move(context)) {
-    _paragraph = paragraphBuilder->Build();
-  }
-
-public:
-  std::unique_ptr<para::Paragraph> _paragraph;
+      : JsiSkWrappingSharedPtrHostObject<para::Paragraph>(
+            std::move(context), std::move(paragraphBuilder->Build())) {}
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkPathEffect.h

@@ -26,7 +26,7 @@ public:
                                                    std::move(pathEffect)) {}
 
   EXPORT_JSI_API_TYPENAME(JsiSkPathEffect, PathEffect)
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkColorFilter, dispose))
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPathEffect, dispose))
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkPictureFactory.h

@@ -45,7 +45,7 @@ public:
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPictureFactory, MakePicture))
 
   explicit JsiSkPictureFactory(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiSkHostObject(context) {}
+      : JsiSkHostObject(std::move(context)) {}
 };
 
 } // namespace RNSkia

package/cpp/api/recorder/Drawings.h

@@ -874,9 +874,10 @@ public:
   }
 
   void draw(DrawingCtx *ctx) {
-    if (props.paragraph && props.paragraph->_paragraph) {
-      props.paragraph->_paragraph->layout(props.width);
-      props.paragraph->_paragraph->paint(ctx->canvas, props.x, props.y);
+    if (props.paragraph) {
+      auto paragraph = props.paragraph->getObject();
+      paragraph->layout(props.width);
+      paragraph->paint(ctx->canvas, props.x, props.y);
     }
   }
 };

package/cpp/rnskia/DawnContext.h

@@ -51,7 +51,7 @@ async_callback(void *c,
 class DawnContext {
 public:
   // TODO: remove
-  friend class RNSkiOSPlatformContext;
+  friend class RNSkApplePlatformContext;
 
   DawnContext(const DawnContext &) = delete;
   DawnContext &operator=(const DawnContext &) = delete;

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

@@ -412,6 +412,9 @@ public:
      *  If a scanline decode is in progress, scanline mode will end, requiring the client to call
      *  startScanlineDecode() in order to return to decoding scanlines.
      *
+     *  For certain codecs, reading into a smaller bitmap than the original dimensions may not
+     *  produce correct results (e.g. animated webp).
+     *
      *  @return Result kSuccess, or another value explaining the type of failure.
      */
     Result getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options*);
@@ -812,6 +815,7 @@ protected:
     }
 
     virtual bool onGetGainmapCodec(SkGainmapInfo*, std::unique_ptr<SkCodec>*) { return false; }
+    virtual bool onGetGainmapInfo(SkGainmapInfo*) { return false; }
 
     // TODO(issues.skia.org/363544350): This API only works for JPEG images. Remove this API once
     // it is no longer used.
@@ -1053,8 +1057,9 @@ private:
     friend class PNGCodecGM;    // for fillIncompleteImage
     friend class SkSampledCodec;
     friend class SkIcoCodec;
-    friend class SkAndroidCodec; // for fEncodedInfo
-    friend class SkPDFBitmap; // for fEncodedInfo
+    friend class SkPngCodec;     // for onGetGainmapCodec
+    friend class SkAndroidCodec;  // for handleFrameIndex
+    friend class SkCodecPriv;     // for fEncodedInfo
 };
 
 namespace SkCodecs {

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

@@ -74,6 +74,12 @@
 */
 //#define SK_R32_SHIFT    16
 
+/*  This controls how much space should be pre-allocated in an SkCanvas object
+    to store the SkMatrix and clip via calls to SkCanvas::save() (and balanced with
+    SkCanvas::restore()).
+*/
+//#define SK_CANVAS_SAVE_RESTORE_PREALLOC_COUNT 32
+
 /* Determines whether to build code that supports the Ganesh GPU backend. Some classes
    that are not GPU-specific, such as SkShader subclasses, have optional code
    that is used allows them to interact with this GPU backend. If you'd like to
@@ -95,6 +101,11 @@
 //#define SK_HISTOGRAM_MEMORY_KB(name, sample)
 //#define SK_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES(name, sampleUSec, minUSec, maxUSec, bucketCount)
 
+/*
+ * Skia can provide extensive logging of Graphite Pipeline lifetimes.
+ */
+//#define SK_PIPELINE_LIFETIME_LOGGING
+
 // To use smaller but slower mipmap builder
 //#define SK_USE_DRAWING_MIPMAP_DOWNSAMPLER
 

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

@@ -34,6 +34,7 @@
 #include "include/private/base/SkDeque.h"
 #include "include/private/base/SkTArray.h"
 
+#include <cstddef>
 #include <cstdint>
 #include <cstring>
 #include <memory>
@@ -2502,15 +2503,18 @@ private:
         void reset(SkDevice* device);
     };
 
-    // the first N recs that can fit here mean we won't call malloc
-    static constexpr int kMCRecSize      = 96; // most recent measurement
-    static constexpr int kMCRecCount     = 32; // common depth for save/restores
+#if defined(SK_CANVAS_SAVE_RESTORE_PREALLOC_COUNT)
+    static constexpr int kMCRecCount = SK_CANVAS_SAVE_RESTORE_PREALLOC_COUNT;
+#else
+    static constexpr int kMCRecCount = 32; // common depth for save/restores
+#endif
 
-    intptr_t fMCRecStorage[kMCRecSize * kMCRecCount / sizeof(intptr_t)];
+    // This stack allocation of memory will be used to house the first kMCRecCount
+    // layers without need to call malloc.
+    alignas(MCRec) std::byte fMCRecStorage[sizeof(MCRec) * kMCRecCount];
 
-    SkDeque     fMCStack;
-    // points to top of stack
-    MCRec*      fMCRec;
+    SkDeque     fMCStack; // uses the stack memory
+    MCRec*      fMCRec;   // points to top of stack for convenience
 
     // Installed via init()
     sk_sp<SkDevice> fRootDevice;

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

@@ -12,6 +12,7 @@
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
 #include "include/private/base/SkCPUTypes.h"
+#include "include/private/base/SkTPin.h"
 
 #include <array>
 #include <cstdint>
@@ -415,6 +416,15 @@ struct SkRGBA4f {
     SkRGBA4f makeOpaque() const {
         return { fR, fG, fB, 1.0f };
     }
+
+    /**
+     Returns a copy of the SkRGBA4f but with the alpha component pinned to [0, 1].
+
+     @return          color with pinned alpha
+    */
+    SkRGBA4f pinAlpha() const {
+        return { fR, fG, fB, SkTPin(fA, 0.f, 1.f) };
+    }
 };
 
 /** \struct SkColor4f

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

@@ -39,6 +39,85 @@ struct SK_API SkColorSpacePrimaries {
     bool toXYZD50(skcms_Matrix3x3* toXYZD50) const;
 };
 
+namespace SkNamedPrimaries {
+
+////////////////////////////////////////////////////////////////////////////////
+// Color primaries defined by ITU-T H.273, table 2. Names are given by the first
+// specification referenced in the value's row.
+
+// Rec. ITU-R BT.709-6, value 1.
+static constexpr SkColorSpacePrimaries kRec709 = {
+        0.64f, 0.33f, 0.3f, 0.6f, 0.15f, 0.06f, 0.3127f, 0.329f};
+
+// Rec. ITU-R BT.470-6 System M (historical), value 4.
+static constexpr SkColorSpacePrimaries kRec470SystemM = {
+        0.67f, 0.33f, 0.21f, 0.71f, 0.14f, 0.08f, 0.31f, 0.316f};
+
+// Rec. ITU-R BT.470-6 System B, G (historical), value 5.
+static constexpr SkColorSpacePrimaries kRec470SystemBG = {
+        0.64f, 0.33f, 0.29f, 0.60f, 0.15f, 0.06f, 0.3127f, 0.3290f};
+
+// Rec. ITU-R BT.601-7 525, value 6.
+static constexpr SkColorSpacePrimaries kRec601 = {
+        0.630f, 0.340f, 0.310f, 0.595f, 0.155f, 0.070f, 0.3127f, 0.3290f};
+
+// SMPTE ST 240, value 7 (functionally the same as value 6).
+static constexpr SkColorSpacePrimaries kSMPTE_ST_240 = kRec601;
+
+// Generic film (colour filters using Illuminant C), value 8.
+static constexpr SkColorSpacePrimaries kGenericFilm = {
+        0.681f, 0.319f, 0.243f, 0.692f, 0.145f, 0.049f, 0.310f, 0.316f};
+
+// Rec. ITU-R BT.2020-2, value 9.
+static constexpr SkColorSpacePrimaries kRec2020{
+        0.708f, 0.292f, 0.170f, 0.797f, 0.131f, 0.046f, 0.3127f, 0.3290f};
+
+// SMPTE ST 428-1, value 10.
+static constexpr SkColorSpacePrimaries kSMPTE_ST_428_1 = {
+        1.f, 0.f, 0.f, 1.f, 0.f, 0.f, 1.f / 3.f, 1.f / 3.f};
+
+// SMPTE RP 431-2, value 11.
+static constexpr SkColorSpacePrimaries kSMPTE_RP_431_2 = {
+        0.680f, 0.320f, 0.265f, 0.690f, 0.150f, 0.060f, 0.314f, 0.351f};
+
+// SMPTE EG 432-1, value 12.
+static constexpr SkColorSpacePrimaries kSMPTE_EG_432_1 = {
+        0.680f, 0.320f, 0.265f, 0.690f, 0.150f, 0.060f, 0.3127f, 0.3290f};
+
+// No corresponding industry specification identified, value 22.
+// This is sometimes referred to as EBU 3213-E, but that document doesn't
+// specify these values.
+static constexpr SkColorSpacePrimaries kITU_T_H273_Value22 = {
+        0.630f, 0.340f, 0.295f, 0.605f, 0.155f, 0.077f, 0.3127f, 0.3290f};
+
+// Mapping between names of color primaries and the number of the corresponding
+// row in ITU-T H.273, table 2.  As above, the constants are named based on the
+// first specification referenced in the value's row.
+enum class CicpId : uint8_t {
+    // Value 0 is reserved.
+    kRec709 = 1,
+    // Value 2 is unspecified.
+    // Value 3 is reserved.
+    kRec470SystemM = 4,
+    kRec470SystemBG = 5,
+    kRec601 = 6,
+    kSMPTE_ST_240 = 7,
+    kGenericFilm = 8,
+    kRec2020 = 9,
+    kSMPTE_ST_428_1 = 10,
+    kSMPTE_RP_431_2 = 11,
+    kSMPTE_EG_432_1 = 12,
+    // Values 13-21 are reserved.
+    kITU_T_H273_Value22 = 22,
+    // Values 23-255 are reserved.
+};
+
+// https://www.w3.org/TR/css-color-4/#predefined-prophoto-rgb
+static constexpr SkColorSpacePrimaries kProPhotoRGB = {
+        0.7347f, 0.2653f, 0.1596f, 0.8404f, 0.0366f, 0.0001f, 0.34567f, 0.35850f};
+
+}  // namespace SkNamedPrimaries
+
 namespace SkNamedTransferFn {
 
 // Like SkNamedGamut::kSRGB, keeping this bitwise exactly the same as skcms makes things fastest.
@@ -48,18 +127,98 @@ static constexpr skcms_TransferFunction kSRGB =
 static constexpr skcms_TransferFunction k2Dot2 =
     { 2.2f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f };
 
+static constexpr skcms_TransferFunction kRec2020 = {
+        2.22222f, 0.909672f, 0.0903276f, 0.222222f, 0.0812429f, 0, 0};
+
+////////////////////////////////////////////////////////////////////////////////
+// Color primaries defined by ITU-T H.273, table 3. Names are given by the first
+// specification referenced in the value's row.
+
+// Rec. ITU-R BT.709-6, value 1.
+static constexpr skcms_TransferFunction kRec709 = {2.222222222222f,
+                                                   0.909672415686f,
+                                                   0.090327584314f,
+                                                   0.222222222222f,
+                                                   0.081242858299f,
+                                                   0.f,
+                                                   0.f};
+
+// Rec. ITU-R BT.470-6 System M (historical) assumed display gamma 2.2, value 4.
+static constexpr skcms_TransferFunction kRec470SystemM = {2.2f, 1.f, 0.f, 0.f, 0.f, 0.f, 0.f};
+
+// Rec. ITU-R BT.470-6 System B, G (historical) assumed display gamma 2.8,
+// value 5.
+static constexpr skcms_TransferFunction kRec470SystemBG = {2.8f, 1.f, 0.f, 0.f, 0.f, 0.f, 0.f};
+
+// Rec. ITU-R BT.601-7, same as kRec709, value 6.
+static constexpr skcms_TransferFunction kRec601 = kRec709;
+
+// SMPTE ST 240, value 7.
+static constexpr skcms_TransferFunction kSMPTE_ST_240 = {
+        2.222222222222f, 0.899626676224f, 0.100373323776f, 0.25f, 0.091286342118f, 0.f, 0.f};
+
+// Linear, value 8
 static constexpr skcms_TransferFunction kLinear =
     { 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f };
 
-static constexpr skcms_TransferFunction kRec2020 =
-    {2.22222f, 0.909672f, 0.0903276f, 0.222222f, 0.0812429f, 0, 0};
+// IEC 61966-2-4, value 11, same as kRec709 (but is explicitly extended).
+static constexpr skcms_TransferFunction kIEC61966_2_4 = kRec709;
+
+// IEC 61966-2-1 sRGB, value 13.
+static constexpr skcms_TransferFunction kIEC61966_2_1 = kSRGB;
+
+// Rec. ITU-R BT.2020-2 (10-bit system), value 14.
+static constexpr skcms_TransferFunction kRec2020_10bit = kRec709;
 
+// Rec. ITU-R BT.2020-2 (12-bit system), value 15.
+static constexpr skcms_TransferFunction kRec2020_12bit = kRec709;
+
+// Rec. ITU-R BT.2100-2 perceptual quantization (PQ) system, value 16.
 static constexpr skcms_TransferFunction kPQ =
     {-2.0f, -107/128.0f, 1.0f, 32/2523.0f, 2413/128.0f, -2392/128.0f, 8192/1305.0f };
 
+// SMPTE ST 428-1, value 17.
+static constexpr skcms_TransferFunction kSMPTE_ST_428_1 = {
+        2.6f, 1.034080527699f, 0.f, 0.f, 0.f, 0.f, 0.f};
+
+// Rec. ITU-R BT.2100-2 hybrid log-gamma (HLG) system, value 18.
 static constexpr skcms_TransferFunction kHLG =
     {-3.0f, 2.0f, 2.0f, 1/0.17883277f, 0.28466892f, 0.55991073f, 0.0f };
 
+// Mapping between transfer function names and the number of the corresponding
+// row in ITU-T H.273, table 3.  As above, the constants are named based on the
+// first specification referenced in the value's row.
+enum class CicpId : uint8_t {
+    // Value 0 is reserved.
+    kRec709 = 1,
+    // Value 2 is unspecified.
+    // Value 3 is reserved.
+    kRec470SystemM = 4,
+    kRec470SystemBG = 5,
+    kRec601 = 6,
+    kSMPTE_ST_240 = 7,
+    kLinear = 8,
+    // Value 9 is not supported by `SkColorSpace::MakeCICP`.
+    // Value 10 is not supported by `SkColorSpace::MakeCICP`.
+    kIEC61966_2_4 = 11,
+    // Value 12 is not supported by `SkColorSpace::MakeCICP`.
+    kIEC61966_2_1 = 13,
+    kSRGB = kIEC61966_2_1,
+    kRec2020_10bit = 14,
+    kRec2020_12bit = 15,
+    kPQ = 16,
+    kSMPTE_ST_428_1 = 17,
+    kHLG = 18,
+    // Values 19-255 are reserved.
+};
+
+// https://w3.org/TR/css-color-4/#valdef-color-prophoto-rgb
+// "The transfer curve is a gamma function with a value of 1/1.8"
+static constexpr skcms_TransferFunction kProPhotoRGB = {1.8f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
+
+// https://www.w3.org/TR/css-color-4/#predefined-a98-rgb
+static constexpr skcms_TransferFunction kA98RGB = k2Dot2;
+
 }  // namespace SkNamedTransferFn
 
 namespace SkNamedGamut {
@@ -122,6 +281,29 @@ public:
     static sk_sp<SkColorSpace> MakeRGB(const skcms_TransferFunction& transferFn,
                                        const skcms_Matrix3x3& toXYZ);
 
+    /**
+     *  Create an SkColorSpace from code points specified in Rec. ITU-T H.273.
+     *  Null will be returned for invalid or unsupported combination of code
+     *  points.
+     *
+     *  Parameters:
+     *
+     * - `color_primaries` identifies an entry in Rec. ITU-T H.273, Table 2.
+     * - `transfer_characteristics` identifies an entry in Rec. ITU-T H.273, Table 3.
+     *
+     * `SkColorSpace` (and the underlying `skcms_ICCProfile`) only supports RGB
+     * color spaces and therefore this function does not take a
+     * `matrix_coefficients` parameter - the caller is expected to verify that
+     * `matrix_coefficients` is `0`.
+     *
+     * Narrow range images are extremely rare - see
+     * https://github.com/w3c/png/issues/312#issuecomment-2327349614.  Therefore
+     * this function doesn't take a `video_full_range_flag` - the caller is
+     * expected to verify that it is `1` (indicating a full range image).
+     */
+    static sk_sp<SkColorSpace> MakeCICP(SkNamedPrimaries::CicpId color_primaries,
+                                        SkNamedTransferFn::CicpId transfer_characteristics);
+
     /**
      *  Create an SkColorSpace from a parsed (skcms) ICC profile.
      */