@shopify/react-native-skia 2.2.21 → 2.3.4

package/android/CMakeLists.txt

@@ -61,7 +61,6 @@ set (SKIA_SKUNICODE_CORE_LIB "skunicode_core")
 set (SKIA_SKUNICODE_ICU_LIB "skunicode_icu")
 set (SKIA_SKOTTIE_LIB "skottie")
 set (SKIA_SKSG_LIB "sksg")
-set (SKIA_PATHOPS_LIB "pathops")
 set (SKIA_JSONREADER_LIB "jsonreader")
 
 
@@ -326,7 +325,6 @@ if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
         ${SKIA_SKUNICODE_ICU_LIB}
         ${SKIA_SKOTTIE_LIB}
         ${SKIA_SKSG_LIB}
-        ${SKIA_PATHOPS_LIB}
         ${SKIA_JSONREADER_LIB}
         ${SKIA_LIB}
         -ljnigraphics
@@ -350,7 +348,6 @@ else()
         ${SKIA_SKUNICODE_ICU_LIB}
         ${SKIA_SKOTTIE_LIB}
         ${SKIA_SKSG_LIB}
-        ${SKIA_PATHOPS_LIB}
         ${SKIA_JSONREADER_LIB}
         ${SKIA_LIB}
         -ljnigraphics

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

@@ -19,10 +19,13 @@
 #include "MainThreadDispatcher.h"
 #include "RNSkAndroidVideo.h"
 #include "RNSkPlatformContext.h"
+
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
 #include "include/ports/SkFontMgr_android.h"
+#include "include/ports/SkFontScanner_FreeType.h"
 
 #pragma clang diagnostic pop
 
@@ -215,7 +218,7 @@ public:
 #endif
 
   sk_sp<SkFontMgr> createFontMgr() override {
-    return SkFontMgr_New_Android(nullptr);
+    return SkFontMgr_New_Android(nullptr, SkFontScanner_Make_FreeType());
   }
 
   void runOnMainThread(std::function<void()> task) override {

package/apple/RNSkApplePlatformContext.mm

@@ -16,8 +16,13 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
+#include "include/core/SkBlendMode.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
 #import "include/core/SkColorSpace.h"
 #include "include/core/SkFontMgr.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkSamplingOptions.h"
 #include "include/core/SkSurface.h"
 
 #include "include/ports/SkFontMgr_mac_ct.h"
@@ -74,22 +79,26 @@ void RNSkApplePlatformContext::releaseNativeBuffer(uint64_t pointer) {
 uint64_t RNSkApplePlatformContext::makeNativeBuffer(sk_sp<SkImage> image) {
   // 0. If Image is not in BGRA, convert to BGRA as only BGRA is supported.
   if (image->colorType() != kBGRA_8888_SkColorType) {
-#if defined(SK_GRAPHITE)
-    SkImage::RequiredProperties requiredProps;
-    image = image->makeColorTypeAndColorSpace(
-        DawnContext::getInstance().getRecorder(), kBGRA_8888_SkColorType,
-        SkColorSpace::MakeSRGB(), requiredProps);
-#else
-    // on iOS, 32_BGRA is the only supported RGB format for CVPixelBuffers.
-    image = image->makeColorTypeAndColorSpace(
-        MetalContext::getInstance().getDirectContext(), kBGRA_8888_SkColorType,
-        SkColorSpace::MakeSRGB());
-#endif
-    if (image == nullptr) {
+    const SkImageInfo bgraInfo =
+        SkImageInfo::Make(image->dimensions(), kBGRA_8888_SkColorType,
+                          kPremul_SkAlphaType, SkColorSpace::MakeSRGB());
+    auto surface = SkSurfaces::Raster(bgraInfo);
+    if (!surface) {
+      throw std::runtime_error(
+          "Failed to allocate raster surface for BGRA conversion");
+    }
+    SkCanvas *canvas = surface->getCanvas();
+    canvas->clear(SK_ColorTRANSPARENT);
+    SkPaint paint;
+    paint.setBlendMode(SkBlendMode::kSrc);
+    canvas->drawImage(image.get(), 0.0f, 0.0f, SkSamplingOptions(), &paint);
+    auto bgraImage = surface->makeImageSnapshot();
+    if (bgraImage == nullptr) {
       throw std::runtime_error(
           "Failed to convert image to BGRA_8888 colortype! Only BGRA_8888 "
           "NativeBuffers are supported.");
     }
+    image = std::move(bgraImage);
   }
 
   // 1. Get image info

package/cpp/api/JsiSkCanvas.h

@@ -34,7 +34,10 @@
 #include "include/core/SkRegion.h"
 #include "include/core/SkSurface.h"
 #include "include/core/SkTypeface.h"
+
+#if !defined(SK_GRAPHITE)
 #include "include/gpu/ganesh/GrDirectContext.h"
+#endif
 
 #pragma clang diagnostic pop
 
@@ -69,7 +72,6 @@ public:
 
   JSI_HOST_FUNCTION(drawImage) {
     auto image = JsiSkImage::fromValue(runtime, arguments[0]);
-    validateImageForDrawing(runtime, image);
     auto x = arguments[1].asNumber();
     auto y = arguments[2].asNumber();
     std::shared_ptr<SkPaint> paint;
@@ -82,7 +84,6 @@ public:
 
   JSI_HOST_FUNCTION(drawImageRect) {
     auto image = JsiSkImage::fromValue(runtime, arguments[0]);
-    validateImageForDrawing(runtime, image);
     auto src = JsiSkRect::fromValue(runtime, arguments[1]);
     auto dest = JsiSkRect::fromValue(runtime, arguments[2]);
     auto paint = JsiSkPaint::fromValue(runtime, arguments[3]);
@@ -95,7 +96,6 @@ public:
 
   JSI_HOST_FUNCTION(drawImageCubic) {
     auto image = JsiSkImage::fromValue(runtime, arguments[0]);
-    validateImageForDrawing(runtime, image);
     auto x = arguments[1].asNumber();
     auto y = arguments[2].asNumber();
     float B = arguments[3].asNumber();
@@ -112,7 +112,6 @@ public:
 
   JSI_HOST_FUNCTION(drawImageOptions) {
     auto image = JsiSkImage::fromValue(runtime, arguments[0]);
-    validateImageForDrawing(runtime, image);
     auto x = arguments[1].asNumber();
     auto y = arguments[2].asNumber();
     auto fm = (SkFilterMode)arguments[3].asNumber();
@@ -129,7 +128,6 @@ public:
 
   JSI_HOST_FUNCTION(drawImageNine) {
     auto image = JsiSkImage::fromValue(runtime, arguments[0]);
-    validateImageForDrawing(runtime, image);
     auto center = JsiSkRect::fromValue(runtime, arguments[1]);
     auto dest = JsiSkRect::fromValue(runtime, arguments[2]);
     auto fm = (SkFilterMode)arguments[3].asNumber();
@@ -146,7 +144,6 @@ public:
 
   JSI_HOST_FUNCTION(drawImageRectCubic) {
     auto image = JsiSkImage::fromValue(runtime, arguments[0]);
-    validateImageForDrawing(runtime, image);
     auto src = JsiSkRect::fromValue(runtime, arguments[1]);
     auto dest = JsiSkRect::fromValue(runtime, arguments[2]);
     float B = arguments[3].asNumber();
@@ -166,7 +163,6 @@ public:
 
   JSI_HOST_FUNCTION(drawImageRectOptions) {
     auto image = JsiSkImage::fromValue(runtime, arguments[0]);
-    validateImageForDrawing(runtime, image);
     auto src = JsiSkRect::fromValue(runtime, arguments[1]);
     auto dest = JsiSkRect::fromValue(runtime, arguments[2]);
     auto filter = (SkFilterMode)arguments[3].asNumber();
@@ -703,20 +699,6 @@ public:
   SkCanvas *getCanvas() { return _canvas; }
 
 private:
-  void validateImageForDrawing(jsi::Runtime &runtime,
-                               const sk_sp<SkImage> image) {
-#if !defined(SK_GRAPHITE)
-    auto ctx = getContext()->getDirectContext();
-    if (!ctx) {
-      throw jsi::JSError(runtime, "No GPU context available");
-    }
-    if (image && !image->isValid(ctx->asRecorder())) {
-      throw jsi::JSError(
-          runtime, "image used in drawImage() does not belong to this context");
-    }
-#endif
-  }
-
   SkCanvas *_canvas;
 };
 } // namespace RNSkia

package/cpp/api/JsiSkImage.h

@@ -17,6 +17,8 @@
 #if defined(SK_GRAPHITE)
 #include "RNDawnContext.h"
 #include "include/gpu/graphite/Context.h"
+#else
+#include "include/gpu/ganesh/GrDirectContext.h"
 #endif
 
 #pragma clang diagnostic push
@@ -241,7 +243,11 @@ public:
     auto rasterImage = DawnContext::getInstance().MakeRasterImage(getObject());
 #else
     auto grContext = getContext()->getDirectContext();
-    auto rasterImage = getObject()->makeRasterImage(grContext);
+    auto image = getObject();
+    if (!grContext) {
+      throw jsi::JSError(runtime, "No GPU context available.");
+    }
+    auto rasterImage = image->makeRasterImage(grContext);
 #endif
     auto hostObjectInstance =
         std::make_shared<JsiSkImage>(getContext(), std::move(rasterImage));
@@ -312,4 +318,4 @@ public:
   }
 };
 
-} // namespace RNSkia
+} // namespace RNSkia

package/cpp/api/JsiSkPath.h

@@ -27,7 +27,7 @@
 #include "include/utils/SkParsePath.h"
 #include "include/utils/SkTextUtils.h"
 
-#include "modules/pathops/include/SkPathOps.h"
+#include "include/pathops/SkPathOps.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkPathFactory.h

@@ -13,7 +13,7 @@
 
 #include "RNSkLog.h"
 #include "include/core/SkPath.h"
-#include "modules/pathops/include/SkPathOps.h"
+#include "include/pathops/SkPathOps.h"
 
 #pragma clang diagnostic pop
 

package/cpp/api/JsiSkSVG.h

@@ -20,10 +20,13 @@ namespace jsi = facebook::jsi;
 
 class JsiSkSVG : public JsiSkWrappingSkPtrHostObject<SkSVGDOM> {
 public:
-  JsiSkSVG(std::shared_ptr<RNSkPlatformContext> context, sk_sp<SkSVGDOM> svgdom)
+  JsiSkSVG(std::shared_ptr<RNSkPlatformContext> context, sk_sp<SkSVGDOM> svgdom,
+           sk_sp<skresources::ResourceProvider> resourceProvider = nullptr)
       : JsiSkWrappingSkPtrHostObject<SkSVGDOM>(std::move(context),
                                                std::move(svgdom)) {}
 
+  ~JsiSkSVG() = default;
+
   EXPORT_JSI_API_TYPENAME(JsiSkSVG, SVG)
 
   JSI_HOST_FUNCTION(width) {

package/cpp/api/JsiSkSVGFactory.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <memory>
+#include <unordered_map>
 #include <utility>
 
 #include <jsi/jsi.h>
@@ -14,6 +15,7 @@
 #pragma clang diagnostic ignored "-Wdocumentation"
 
 #include "include/core/SkStream.h"
+#include "modules/skresources/include/SkResources.h"
 
 #pragma clang diagnostic pop
 
@@ -21,24 +23,141 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
+class SVGAssetProvider : public skresources::ResourceProvider {
+public:
+  using AssetMap = std::unordered_map<std::string, sk_sp<SkData>>;
+
+  static sk_sp<SVGAssetProvider>
+  Make(AssetMap assets, skresources::ImageDecodeStrategy strategy =
+                            skresources::ImageDecodeStrategy::kPreDecode) {
+    return sk_sp<SVGAssetProvider>(
+        new SVGAssetProvider(std::move(assets), strategy));
+  }
+
+  // Override loadImageAsset() to handle image loading
+  sk_sp<skresources::ImageAsset>
+  loadImageAsset(const char[] /*path*/, const char name[],
+                 const char[] /*id*/) const override {
+    // Identify resources by name only
+    auto it = fAssets.find(name);
+    if (it != fAssets.end()) {
+      // Create ImageAsset from SkData
+      return skresources::MultiFrameImageAsset::Make(it->second, fStrategy);
+    }
+    return nullptr;
+  }
+
+private:
+  explicit SVGAssetProvider(AssetMap assets,
+                            skresources::ImageDecodeStrategy strategy)
+      : fAssets(std::move(assets)), fStrategy(strategy) {}
+  const AssetMap fAssets;
+  const skresources::ImageDecodeStrategy fStrategy;
+};
+
 class JsiSkSVGFactory : public JsiSkHostObject {
 public:
-  JSI_HOST_FUNCTION(MakeFromData) {
-    auto data = JsiSkData::fromValue(runtime, arguments[0]);
-    auto stream = SkMemoryStream::Make(data);
-    auto svg_dom = SkSVGDOM::Builder().make(*stream);
+  // Helper function to parse asset map from JS object
+  static SVGAssetProvider::AssetMap parseAssetMap(jsi::Runtime &runtime,
+                                                  const jsi::Value &jsValue) {
+    SVGAssetProvider::AssetMap assets;
+
+    if (!jsValue.isObject()) {
+      return assets;
+    }
+
+    auto jsAssetMap = jsValue.asObject(runtime);
+
+    // Convert JS object to C++ AssetMap
+    auto propertyNames = jsAssetMap.getPropertyNames(runtime);
+    size_t propertyCount = propertyNames.size(runtime);
+
+    for (size_t i = 0; i < propertyCount; i++) {
+      auto propertyName =
+          propertyNames.getValueAtIndex(runtime, i).asString(runtime);
+      auto key = propertyName.utf8(runtime);
+      auto jsValue = jsAssetMap.getProperty(runtime, propertyName);
+
+      // Skip null or undefined values
+      if (jsValue.isNull() || jsValue.isUndefined()) {
+        continue;
+      }
+
+      if (jsValue.isObject()) {
+        auto jsObject = jsValue.asObject(runtime);
+        if (jsObject.isHostObject(runtime)) {
+          auto hostObject = jsObject.getHostObject(runtime);
+          auto skData = std::dynamic_pointer_cast<JsiSkData>(hostObject);
+          if (skData) {
+            assets[key] = skData->getObject();
+          }
+        }
+      }
+    }
+
+    return assets;
+  }
+
+private:
+  jsi::Value makeSVGFromStream(jsi::Runtime &runtime,
+                               std::unique_ptr<SkMemoryStream> stream,
+                               sk_sp<SkFontMgr> fontMgr,
+                               SVGAssetProvider::AssetMap assets) {
+    auto builder = SkSVGDOM::Builder();
+
+    if (fontMgr) {
+      builder.setFontManager(fontMgr);
+    }
+
+    auto baseProvider = SVGAssetProvider::Make(
+        std::move(assets), skresources::ImageDecodeStrategy::kPreDecode);
+    auto provider = skresources::DataURIResourceProviderProxy::Make(
+        std::move(baseProvider), skresources::ImageDecodeStrategy::kPreDecode,
+        fontMgr);
+
+    // TODO: this sk_sp subclassing issue needs to be fixed.
+    provider->ref();
+    builder.setResourceProvider(provider);
+
+    auto svg_dom = builder.make(*stream);
     auto svg = std::make_shared<JsiSkSVG>(getContext(), std::move(svg_dom));
     return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, svg,
                                                        getContext());
   }
 
+public:
+  JSI_HOST_FUNCTION(MakeFromData) {
+    auto data = JsiSkData::fromValue(runtime, arguments[0]);
+    auto stream = SkMemoryStream::Make(data);
+
+    // Parse fontMgr (second parameter)
+    auto fontMgr = count > 1 && arguments[1].isObject()
+                       ? JsiSkFontMgr::fromValue(runtime, arguments[1])
+                       : nullptr;
+
+    // Parse assets map (third parameter)
+    auto assets = count > 2 ? parseAssetMap(runtime, arguments[2])
+                            : SVGAssetProvider::AssetMap();
+
+    return makeSVGFromStream(runtime, std::move(stream), fontMgr,
+                             std::move(assets));
+  }
+
   JSI_HOST_FUNCTION(MakeFromString) {
     auto svgText = arguments[0].asString(runtime).utf8(runtime);
     auto stream = SkMemoryStream::MakeDirect(svgText.c_str(), svgText.size());
-    auto svg_dom = SkSVGDOM::Builder().make(*stream);
-    auto svg = std::make_shared<JsiSkSVG>(getContext(), std::move(svg_dom));
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, svg,
-                                                       getContext());
+
+    // Parse fontMgr (second parameter)
+    auto fontMgr = count > 1 && arguments[1].isObject()
+                       ? JsiSkFontMgr::fromValue(runtime, arguments[1])
+                       : nullptr;
+
+    // Parse assets map (third parameter)
+    auto assets = count > 2 ? parseAssetMap(runtime, arguments[2])
+                            : SVGAssetProvider::AssetMap();
+
+    return makeSVGFromStream(runtime, std::move(stream), fontMgr,
+                             std::move(assets));
   }
 
   size_t getMemoryPressure() const override { return 512; }

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

@@ -14,6 +14,9 @@
 
 namespace AHardwareBufferUtils {
 
+// SkColorType expected for AHBs imported as external images
+static const SkColorType kExternalFormatColorType = SkColorType::kRGBA_8888_SkColorType;
+
 SkColorType GetSkColorTypeFromBufferFormat(uint32_t bufferFormat);
 
 }  // namespace AHardwareBufferUtils

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

@@ -22,10 +22,6 @@ extern "C" {
 
 namespace GrAHardwareBufferUtils {
 
-// TODO: remove this function once Android has been updated to call the AHardwareBufferUtils
-// version
-SkColorType GetSkColorTypeFromBufferFormat(uint32_t bufferFormat);
-
 #if !defined(SK_DISABLE_LEGACY_ANDROID_HW_UTILS)
 GrBackendFormat GetBackendFormat(GrDirectContext* dContext, AHardwareBuffer* hardwareBuffer,
                                  uint32_t bufferFormat, bool requireKnownFormat);

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

@@ -13,8 +13,6 @@
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkTileMode.h"
 
-#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
-
 class SkCanvas;
 struct SkIRect;
 struct SkRect;
@@ -84,6 +82,4 @@ public:
     static bool ShaderAsALinearGradient(SkShader* shader, LinearGradientInfo*);
 };
 
-#endif // SK_BUILD_FOR_ANDROID_ANDROID
-
 #endif // SkAndroidFrameworkUtils_DEFINED

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

@@ -14,6 +14,7 @@
 
 class SkColorSpace;
 class GrDirectContext;
+class GrRecordingContext;
 class SkPixmap;
 struct AHardwareBuffer;
 

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

@@ -18,6 +18,7 @@
 #include "include/core/SkTypes.h"
 #include "include/core/SkYUVAPixmaps.h"
 #include "include/private/SkEncodedInfo.h"
+#include "include/private/SkHdrMetadata.h"
 #include "include/private/base/SkNoncopyable.h"
 #include "modules/skcms/skcms.h"
 
@@ -239,6 +240,12 @@ public:
         return this->getEncodedInfo().profile();
     }
 
+    /**
+     * Return the HDR metadata associated with this image. Note that even SDR images can include
+     * HDR metadata (e.g, indicating how to inverse tone map when displayed on an HDR display).
+     */
+    const skhdr::Metadata& getHdrMetadata() const { return fEncodedInfo.getHdrMetadata(); }
+
     /**
      * Whether the encoded input uses 16 or more bits per component.
      */
@@ -903,12 +910,21 @@ protected:
      */
     [[nodiscard]] bool rewindIfNeeded();
 
+    /**
+     *  Called by onRewind(), attempts to rewind fStream.
+     */
+    bool rewindStream();
+
     /**
      *  Called by rewindIfNeeded, if the stream needed to be rewound.
      *
-     *  Subclasses should do any set up needed after a rewind.
+     *  Subclasses should call rewindStream() if they own one, and then
+     *  do any set up needed after.
      */
     virtual bool onRewind() {
+        if (!this->rewindStream()) {
+            return false;
+        }
         return true;
     }
 
@@ -992,7 +1008,12 @@ private:
     };
     XformTime                          fXformTime;
     XformFormat                        fDstXformFormat; // Based on fDstInfo.
-    skcms_ICCProfile                   fDstProfile;
+    skcms_ICCProfile                   fDstProfileStorage;
+    // This tracks either fDstProfileStorage or the ICC profile in fEncodedInfo.
+    // For the latter case it is important to not make a profile copy because skcms_Transform
+    // only performs a shallow pointer comparison to decide whether it can skip the color space
+    // transformation.
+    const skcms_ICCProfile*            fDstProfile = &fDstProfileStorage;
     skcms_AlphaFormat                  fDstXformAlphaFormat;
 
     // Only meaningful during scanline decodes.

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 Google LLC.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkPngRustDecoder_DEFINED
+#define SkPngRustDecoder_DEFINED
+
+#include <memory>
+
+#include "include/codec/SkCodec.h"
+#include "include/private/base/SkAPI.h"
+
+class SkStream;
+
+namespace SkPngRustDecoder {
+
+/** Returns true if this data claims to be a PNG image. */
+SK_API bool IsPng(const void*, size_t);
+
+SK_API std::unique_ptr<SkCodec> Decode(std::unique_ptr<SkStream>,
+                                       SkCodec::Result*,
+                                       SkCodecs::DecodeContext = nullptr);
+
+inline constexpr SkCodecs::Decoder Decoder() { return {"png", IsPng, Decode}; }
+
+}  // namespace SkPngRustDecoder
+
+#endif  // SkPngRustDecoder_DEFINED

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

@@ -1230,7 +1230,7 @@ public:
         memory from the heap. This is the default SkBitmap::Allocator invoked by
         allocPixels().
     */
-    class HeapAllocator : public Allocator {
+    class SK_API HeapAllocator : public Allocator {
     public:
 
         /** Allocates the pixel memory for the bitmap, given its dimensions and

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

@@ -12,6 +12,7 @@
 #include "include/core/SkRefCnt.h"
 #include "include/private/base/SkAPI.h"
 
+class SkCanvas;
 class SkSurface;
 class SkSurfaceProps;
 struct SkImageInfo;
@@ -52,6 +53,10 @@ public:
                                        const SkSurfaceProps* surfaceProps);
     sk_sp<SkSurface> makeBitmapSurface(const SkImageInfo& imageInfo,
                                        const SkSurfaceProps* surfaceProps = nullptr);
+
+private:
+    // TODO (b/412351769): Implement this so we can capture from a CPU Recorder.
+    SkCanvas* makeCaptureCanvas(SkCanvas*) final { return nullptr; }
 };
 
 inline Recorder* AsRecorder(SkRecorder* recorder) {

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

@@ -2584,6 +2584,8 @@ private:
     void checkForDeferredSave();
     void internalSetMatrix(const SkM44&);
 
+    virtual void onSurfaceDelete() {}
+
     friend class SkAndroidFrameworkUtils;
     friend class SkCanvasPriv;      // needs to expose android functions for testing outside android
     friend class AutoLayerForImageFilter;

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

@@ -131,17 +131,16 @@ 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.
+// Transfer function defined by ITU-T H.273, table 3. Names are given by the
+// first specification referenced in the value's row. The equations in table 3
+// "either indicates the reference [OETF] ... or indicates the inverse of the
+// reference EOTF". The transfer functions provided are reference EOTFs.
 
-// 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.709-6, value 1. This follows note 1, which reads: "In the cases
+// of [...] TransferCharacteristics equal to 1, 6, 14 or 15 [...], although the
+// value is defined in terms of a reference [OETF], a suggested corresponding
+// reference [EOTF] has been specified in Rec. ITU-R BT.1886-0."
+static constexpr skcms_TransferFunction kRec709 = {2.4f, 1.f, 0.f, 0.f, 0.f, 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};
@@ -175,7 +174,7 @@ 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 };
+    {-5.0f, 203.f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f };
 
 // SMPTE ST 428-1, value 17.
 static constexpr skcms_TransferFunction kSMPTE_ST_428_1 = {
@@ -183,7 +182,7 @@ static constexpr skcms_TransferFunction kSMPTE_ST_428_1 = {
 
 // 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 };
+    {-6.0f, 203.f, 1000.0f, 1.2f, 0.0f, 0.0f, 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

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

@@ -13,8 +13,7 @@
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
 #include "include/core/SkSpan.h"
-#include "include/private/base/SkAPI.h"
-#include "include/private/base/SkAssert.h"
+#include "include/core/SkTypes.h"
 #include "include/private/base/SkTDArray.h"
 
 #include <cstddef>
@@ -22,6 +21,7 @@
 
 class SkMatrix;
 class SkPath;
+class SkPathBuilder;
 
 class SK_API SkContourMeasure : public SkRefCnt {
 public:
@@ -54,8 +54,12 @@ public:
      then return false (and leave dst untouched).
      Begin the segment with a moveTo if startWithMoveTo is true
      */
+    [[nodiscard]] bool getSegment(SkScalar startD, SkScalar stopD, SkPathBuilder* dst,
+                                  bool startWithMoveTo) const;
+#ifdef SK_SUPPORT_MUTABLE_PATHEFFECT
     [[nodiscard]] bool getSegment(SkScalar startD, SkScalar stopD, SkPath* dst,
                                   bool startWithMoveTo) const;
+#endif
 
     /** Return true if the contour is closed()
      */