@shopify/react-native-skia 1.11.8 → 1.11.9-next.1

package/android/CMakeLists.txt

@@ -13,7 +13,6 @@ set (SKIA_SKPARAGRAPH_LIB "skparagraph")
 set (SKIA_SKUNICODE_CORE_LIB "skunicode_core")
 set (SKIA_SKUNICODE_ICU_LIB "skunicode_icu")
 
-
 # Clear some variables
 unset(LIBRN_DIR CACHE)
 unset(libfbjni_link_DIRS CACHE)
@@ -40,7 +39,6 @@ if(SK_GRAPHITE)
     set(DAWN_PLATFORM_LIB "libdawn_platform_static")
     set(DAWN_PROC_LIB "libdawn_proc_static")
     set(BACKEND_SOURCES
-    #TODO: is this source needed to be added?
         "${PROJECT_SOURCE_DIR}/../cpp/rnskia/DawnWindowContext.cpp"
     )
     add_library(libdawn_native_static STATIC IMPORTED)
@@ -59,14 +57,6 @@ else()
     )
 endif()
 
-if(${REACT_NATIVE_VERSION} LESS 66)
-        file(
-                TO_CMAKE_PATH
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/jsi.cpp"
-                INCLUDE_JSI_CPP
-        )
-endif()
-
 add_library(
         ${PACKAGE_NAME}
         SHARED
@@ -91,7 +81,6 @@ add_library(
         ${BACKEND_SOURCES}
 )
 
-
 target_include_directories(
         ${PACKAGE_NAME}
         PRIVATE
@@ -140,160 +129,48 @@ set_property(TARGET skunicode_core PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}
 add_library(skunicode_icu STATIC IMPORTED)
 set_property(TARGET skunicode_icu PROPERTY IMPORTED_LOCATION "${SKIA_LIBS_PATH}/libskunicode_icu.a")
 
-
 find_library(
         LOG_LIB
         log
 )
 message("-- LOG     : " ${LOG_LIB})
 
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-    # We need to find packages since from RN 0.71 binaries are prebuilt
-    find_package(fbjni REQUIRED CONFIG)
-    find_package(ReactAndroid REQUIRED CONFIG)
-endif()
+# Find the required packages for RN 0.78+
+find_package(fbjni REQUIRED CONFIG)
+find_package(ReactAndroid REQUIRED CONFIG)
 
-unset(JSI_LIB CACHE)
-if(${REACT_NATIVE_VERSION} LESS 66)
-    # JSI lib didn't exist on RN 0.65 and before. Simply omit it.
-    set (JSI_LIB "")
-elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-    # RN 0.71 distributes prebuilt binaries.
-    set (JSI_LIB ReactAndroid::jsi)
-else()
-    # RN 0.66 distributes libjsi.so, can be used instead of compiling jsi.cpp manually.
-    find_library(
-        JSI_LIB
-        jsi
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-    )
-endif()
+# Set JSI library for RN 0.78+
+set (JSI_LIB ReactAndroid::jsi)
 message("-- JSI     : " ${JSI_LIB})
 
-unset(REACT_LIB CACHE)
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
-    # RN 0.76 packs react_nativemodule_core into ReactAndroid::reactnative
-    set (REACT_LIB ReactAndroid::reactnative)
-elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-    # RN 0.71 distributes prebuilt binaries.
-    set (REACT_LIB ReactAndroid::react_nativemodule_core)
-    else()
-    find_library(
-            REACT_LIB
-            react_nativemodule_core
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-endif()
+# Set React library for RN 0.78+
+set (REACT_LIB ReactAndroid::reactnative)
 message("-- REACT   : " ${REACT_LIB})
 
-unset(FBJNI_LIBRARY CACHE)
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-    # RN 0.71 distributes prebuilt binaries.
-    set (FBJNI_LIBRARY fbjni::fbjni)
-else()
-    find_library(
-            FBJNI_LIBRARY
-            fbjni
-            PATHS ${libfbjni_link_DIRS}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-endif()
+# Set FBJNI library for RN 0.78+
+set (FBJNI_LIBRARY fbjni::fbjni)
 message("-- FBJNI   : " ${FBJNI_LIBRARY})
 
-unset(REACTNATIVEJNI_LIB CACHE)
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
-    # RN 0.76 doesn't have reactnativejni
-    # DO NOTHING, we'll not link these libraries
-elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-    # RN 0.71 distributes prebuilt binaries.
-    set (REACTNATIVEJNI_LIB "ReactAndroid::reactnativejni")
-else()
-    find_library(
-            REACTNATIVEJNI_LIB
-            reactnativejni
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-endif()
-message("-- REACTNATIVEJNI   : " ${REACTNATIVEJNI_LIB})
-
-unset(RUNTIMEEXECUTOR_LIB CACHE)
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
-    # RN 0.76 doesn't have runtimeexecutor
-    # DO NOTHING, we'll not link these libraries
-elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-    # RN 0.71 distributes prebuilt binaries.
-    set (RUNTIMEEXECUTOR_LIB "ReactAndroid::runtimeexecutor")
-else()
-    find_library(
-            RUNTIMEEXECUTOR_LIB
-            runtimeexecutor
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-endif()
-message("-- RUNTIMEEXECUTOR   : " ${RUNTIMEEXECUTOR_LIB})
-
-unset(TURBOMODULES_LIB CACHE)
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
-    # RN 0.76 doesn't have turbomodulejsijni
-    # DO NOTHING, we'll not link these libraries
-elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
-    # RN 0.71 distributes prebuilt binaries.
-    set (TURBOMODULES_LIB "ReactAndroid::turbomodulejsijni")
-else()
-    find_library(
-            TURBOMODULES_LIB
-            turbomodulejsijni
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-endif()
-message("-- TURBO   : " ${TURBOMODULES_LIB})
-
-add_definitions(-DREACT_NATIVE_VERSION=${REACT_NATIVE_VERSION})
-
-# Link
-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
-    set(COMMON_LIBS
-        ${LOG_LIB}
-        ${REACT_LIB}
-        ${FBJNI_LIBRARY}
-        ${JSI_LIB}
-        ${SKIA_SVG_LIB}
-        ${SKIA_SKSHAPER_LIB}
-        ${SKIA_SKPARAGRAPH_LIB}
-        ${SKIA_SKUNICODE_CORE_LIB}
-        ${SKIA_SKUNICODE_ICU_LIB}
-        ${SKIA_LIB}
-        -ljnigraphics
-        -lGLESv2
-        -lEGL
-        -landroid
-    )
-else()
-    set(COMMON_LIBS
-        ${LOG_LIB}
-        ${FBJNI_LIBRARY}
-        ${REACT_LIB}
-        ${JSI_LIB}
-        ${REACTNATIVEJNI_LIB}
-        ${RUNTIMEEXECUTOR_LIB}
-        ${TURBOMODULES_LIB}
-        ${SKIA_SVG_LIB}
-        ${SKIA_SKSHAPER_LIB}
-        ${SKIA_SKPARAGRAPH_LIB}
-        ${SKIA_SKUNICODE_CORE_LIB}
-        ${SKIA_SKUNICODE_ICU_LIB}
-        ${SKIA_LIB}
-        -ljnigraphics
-        -lGLESv2
-        -lEGL
-        -landroid
-    )
-endif()
+# Define React Native version
+add_definitions(-DREACT_NATIVE_VERSION=78)
+
+# Link libraries for RN 0.78+
+set(COMMON_LIBS
+    ${LOG_LIB}
+    ${REACT_LIB}  # This is ReactAndroid::reactnative which includes all needed components
+    ${FBJNI_LIBRARY}
+    ${JSI_LIB}
+    ${SKIA_SVG_LIB}
+    ${SKIA_SKSHAPER_LIB}
+    ${SKIA_SKPARAGRAPH_LIB}
+    ${SKIA_SKUNICODE_CORE_LIB}
+    ${SKIA_SKUNICODE_ICU_LIB}
+    ${SKIA_LIB}
+    -ljnigraphics
+    -lGLESv2
+    -lEGL
+    -landroid
+)
 
 if(SK_GRAPHITE)
     target_link_libraries(${PACKAGE_NAME}
@@ -308,4 +185,4 @@ else()
         -lGLESv2
         -lEGL
     )
-endif()
+endif()

package/android/build.gradle

@@ -19,7 +19,7 @@ import java.nio.file.Paths
 // the minimum React Native version supported.
 def DEFAULT_COMPILE_SDK_VERSION = 28
 def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
-def DEFAULT_MIN_SDK_VERSION = 16
+def DEFAULT_MIN_SDK_VERSION = 26
 def DEFAULT_TARGET_SDK_VERSION = 28
 
 def safeExtGet(prop, fallback) {

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.
      */