@shopify/react-native-skia 0.1.234 → 0.1.237

package/cpp/api/JsiSkApi.h

@@ -69,6 +69,8 @@ public:
     installFunction("Font", JsiSkFont::createCtor(context));
     installFunction("Paint", JsiSkPaint::createCtor(context));
     installFunction("RSXform", JsiSkRSXform::createCtor(context));
+    installFunction("RSXformFromRadians",
+                    JsiSkRSXform::createCtorFromRadians(context));
     installFunction("Matrix", JsiSkMatrix::createCtor(context));
     installFunction("XYWHRect", JsiSkRect::createCtor(context));
     installFunction("RRectXY", JsiSkRRect::createCtor(context));

package/cpp/api/JsiSkCanvas.h

@@ -14,6 +14,7 @@
 #include "JsiSkPicture.h"
 #include "JsiSkPoint.h"
 #include "JsiSkRRect.h"
+#include "JsiSkRSXform.h"
 #include "JsiSkSVG.h"
 #include "JsiSkTextBlob.h"
 #include "JsiSkVertices.h"
@@ -495,6 +496,40 @@ public:
     return jsi::Value::undefined();
   }
 
+  JSI_HOST_FUNCTION(drawAtlas) {
+    auto atlas = JsiSkImage::fromValue(runtime, arguments[0]);
+    auto rects = arguments[1].asObject(runtime).asArray(runtime);
+    auto transforms = arguments[2].asObject(runtime).asArray(runtime);
+    auto paint = JsiSkPaint::fromValue(runtime, arguments[3]);
+    auto blendMode = count > 5 && !arguments[4].isUndefined()
+                         ? static_cast<SkBlendMode>(arguments[4].asNumber())
+                         : SkBlendMode::kSrcOver;
+
+    std::vector<SkRSXform> xforms;
+    int xformsSize = static_cast<int>(transforms.size(runtime));
+    xforms.reserve(xformsSize);
+    for (int i = 0; i < xformsSize; i++) {
+      auto xform = JsiSkRSXform::fromValue(
+          runtime, transforms.getValueAtIndex(runtime, i).asObject(runtime));
+      xforms.push_back(*xform.get());
+    }
+
+    std::vector<SkRect> skRects;
+    int rectsSize = static_cast<int>(rects.size(runtime));
+    skRects.reserve(rectsSize);
+    for (int i = 0; i < rectsSize; i++) {
+      auto rect = JsiSkRect::fromValue(
+          runtime, rects.getValueAtIndex(runtime, i).asObject(runtime));
+      skRects.push_back(*rect.get());
+    }
+    SkSamplingOptions sampling;
+    _canvas->drawAtlas(atlas.get(), xforms.data(), skRects.data(), nullptr,
+                       skRects.size(), blendMode, sampling, nullptr,
+                       paint.get());
+
+    return jsi::Value::undefined();
+  }
+
   JSI_HOST_FUNCTION(readPixels) {
     auto srcX = static_cast<int>(arguments[0].asNumber());
     auto srcY = static_cast<int>(arguments[1].asNumber());
@@ -567,6 +602,7 @@ public:
                        JSI_EXPORT_FUNC(JsiSkCanvas, clear),
                        JSI_EXPORT_FUNC(JsiSkCanvas, concat),
                        JSI_EXPORT_FUNC(JsiSkCanvas, drawPicture),
+                       JSI_EXPORT_FUNC(JsiSkCanvas, drawAtlas),
                        JSI_EXPORT_FUNC(JsiSkCanvas, readPixels))
 
   explicit JsiSkCanvas(std::shared_ptr<RNSkPlatformContext> context)

package/cpp/api/JsiSkRSXform.h

@@ -40,13 +40,23 @@ public:
     return jsi::Value(SkScalarToDouble(getObject()->fTy));
   }
 
+  JSI_HOST_FUNCTION(set) {
+    auto scos = arguments[0].asNumber();
+    auto ssin = arguments[1].asNumber();
+    auto tx = arguments[2].asNumber();
+    auto ty = arguments[3].asNumber();
+    getObject()->set(scos, ssin, tx, ty);
+    return jsi::Value::undefined();
+  }
+
   JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkRSXform, __typename__),
                               JSI_EXPORT_PROP_GET(JsiSkRSXform, scos),
                               JSI_EXPORT_PROP_GET(JsiSkRSXform, ssin),
                               JSI_EXPORT_PROP_GET(JsiSkRSXform, tx),
                               JSI_EXPORT_PROP_GET(JsiSkRSXform, ty))
 
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRSXform, dispose))
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRSXform, set),
+                       JSI_EXPORT_FUNC(JsiSkRSXform, dispose))
 
   /**
   Returns the underlying object from a host object of this type
@@ -57,12 +67,10 @@ public:
     if (object.isHostObject(runtime)) {
       return object.asHostObject<JsiSkRSXform>(runtime)->getObject();
     } else {
-      auto scos =
-          object.getArray(runtime).getValueAtIndex(runtime, 0).asNumber();
-      auto ssin =
-          object.getArray(runtime).getValueAtIndex(runtime, 1).asNumber();
-      auto tx = object.getArray(runtime).getValueAtIndex(runtime, 2).asNumber();
-      auto ty = object.getArray(runtime).getValueAtIndex(runtime, 3).asNumber();
+      auto scos = object.getProperty(runtime, "scos").asNumber();
+      auto ssin = object.getProperty(runtime, "ssin").asNumber();
+      auto tx = object.getProperty(runtime, "tx").asNumber();
+      auto ty = object.getProperty(runtime, "ty").asNumber();
       return std::make_shared<SkRSXform>(SkRSXform::Make(scos, ssin, tx, ty));
     }
   }
@@ -77,6 +85,26 @@ public:
         runtime, std::make_shared<JsiSkRSXform>(std::move(context), rsxform));
   }
 
+  /**
+   * Creates the function for construction a new instance of the SkRSXform
+   * wrapper
+   * @param context platform context
+   * @return A function for creating a new host object wrapper for the SkRSXform
+   * class
+   */
+  static const jsi::HostFunctionType
+  createCtorFromRadians(std::shared_ptr<RNSkPlatformContext> context) {
+    return JSI_HOST_FUNCTION_LAMBDA {
+      auto rsxform = SkRSXform::MakeFromRadians(
+          arguments[0].asNumber(), arguments[1].asNumber(),
+          arguments[2].asNumber(), arguments[3].asNumber(),
+          arguments[4].asNumber(), arguments[5].asNumber());
+      // Return the newly constructed object
+      return jsi::Object::createFromHostObject(
+          runtime, std::make_shared<JsiSkRSXform>(std::move(context),
+                                                  std::move(rsxform)));
+    };
+  }
   /**
    * Creates the function for construction a new instance of the SkRSXform
    * wrapper

package/cpp/api/JsiSkTypefaceFactory.h

@@ -17,7 +17,8 @@ class JsiSkTypefaceFactory : public JsiSkHostObject {
 public:
   JSI_HOST_FUNCTION(MakeFreeTypeFaceFromData) {
     auto data = JsiSkData::fromValue(runtime, arguments[0]);
-    auto typeface = SkFontMgr::RefDefault()->makeFromData(std::move(data));
+    auto fontMgr = JsiSkFontMgrFactory::getFontMgr(getContext());
+    auto typeface = fontMgr->makeFromData(std::move(data));
     if (typeface == nullptr) {
       return jsi::Value::null();
     }

package/cpp/rnskia/dom/JsiDomApi.h

@@ -8,6 +8,7 @@
 
 #include "JsiHostObject.h"
 
+#include "nodes/JsiAtlasNode.h"
 #include "nodes/JsiCircleNode.h"
 #include "nodes/JsiDiffRectNode.h"
 #include "nodes/JsiFillNode.h"
@@ -66,6 +67,7 @@ public:
     installFunction("PatchNode", JsiPatchNode::createCtor(context));
     installFunction("PointsNode", JsiPointsNode::createCtor(context));
     installFunction("DiffRectNode", JsiDiffRectNode::createCtor(context));
+    installFunction("AtlasNode", JsiAtlasNode::createCtor(context));
 
     installFunction("FillNode", JsiFillNode::createCtor(context));
 

package/cpp/rnskia/dom/nodes/JsiAtlasNode.h

@@ -0,0 +1,60 @@
+#pragma once
+
+#include "JsiDomDrawingNode.h"
+#include "RSXformProp.h"
+#include "RectProp.h"
+#include "SkImageProps.h"
+
+#include <memory>
+#include <tuple>
+
+namespace RNSkia {
+
+class JsiAtlasNode : public JsiDomDrawingNode,
+                     public JsiDomNodeCtor<JsiAtlasNode> {
+public:
+  explicit JsiAtlasNode(std::shared_ptr<RNSkPlatformContext> context)
+      : JsiDomDrawingNode(context, "skAtlas") {}
+
+protected:
+  void draw(DrawingContext *context) override {
+    if (_rectsProp->isSet() && _imageProp->isSet() && _rsxFormsProp->isSet()) {
+      const auto image = _imageProp->getDerivedValue();
+      const auto sprites = _rectsProp->getDerivedValue();
+      const auto transforms = _rsxFormsProp->getDerivedValue();
+      const auto colors =
+          _colorsProp->isSet() ? _colorsProp->getDerivedValue() : nullptr;
+      const auto blendMode = _blendModeProp->isSet()
+                                 ? *_blendModeProp->getDerivedValue()
+                                 : SkBlendMode::kDstOver;
+      auto paint = *context->getPaint();
+      SkSamplingOptions sampling(SkFilterMode::kLinear, SkMipmapMode::kNone);
+      context->getCanvas()->drawAtlas(
+          image.get(), transforms->data(), sprites->data(),
+          colors == nullptr ? nullptr : colors->data(), sprites->size(),
+          blendMode, sampling, nullptr, &paint);
+    }
+  }
+
+  void defineProperties(NodePropsContainer *container) override {
+    JsiDomDrawingNode::defineProperties(container);
+    _rectsProp = container->defineProperty<RectsProp>("sprites");
+    _rsxFormsProp = container->defineProperty<RSXFormsProp>("transforms");
+    _imageProp = container->defineProperty<ImageProp>("image");
+    _colorsProp = container->defineProperty<ColorsProp>("colors");
+    _blendModeProp = container->defineProperty<BlendModeProp>("blendMode");
+
+    _rectsProp->require();
+    _rsxFormsProp->require();
+    _imageProp->require();
+  }
+
+private:
+  ImageProp *_imageProp;
+  RectsProp *_rectsProp;
+  RSXFormsProp *_rsxFormsProp;
+  ColorsProp *_colorsProp;
+  BlendModeProp *_blendModeProp;
+};
+
+} // namespace RNSkia

package/cpp/rnskia/dom/props/RSXformProp.h

@@ -0,0 +1,52 @@
+#pragma once
+
+#include "JsiSkRSXform.h"
+#include "NodeProp.h"
+
+#include <memory>
+#include <utility>
+#include <vector>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+
+#include "SkRSXform.h"
+
+#pragma clang diagnostic pop
+
+namespace RNSkia {
+
+// TODO: Factorize these array classes
+class RSXFormsProp : public DerivedProp<std::vector<SkRSXform>> {
+public:
+  explicit RSXFormsProp(PropId name,
+                        const std::function<void(BaseNodeProp *)> &onChange)
+      : DerivedProp<std::vector<SkRSXform>>(onChange) {
+    _rsxFormsProp = defineProperty<NodeProp>(name);
+  }
+
+  void updateDerivedValue() override {
+    if (_rsxFormsProp->isSet()) {
+      auto rsxforms = _rsxFormsProp->value().getAsArray();
+      std::vector<SkRSXform> derivedRSXForms;
+      derivedRSXForms.reserve(rsxforms.size());
+
+      for (size_t i = 0; i < rsxforms.size(); ++i) {
+        auto val = rsxforms[i];
+        if (val.getType() == PropType::HostObject) {
+          auto rsx =
+              std::dynamic_pointer_cast<JsiSkRSXform>(val.getAsHostObject())
+                  ->getObject();
+          derivedRSXForms.push_back(*rsx);
+        }
+      }
+      setDerivedValue(std::move(derivedRSXForms));
+    } else {
+      setDerivedValue(nullptr);
+    }
+  }
+
+private:
+  NodeProp *_rsxFormsProp;
+};
+} // namespace RNSkia

package/cpp/rnskia/dom/props/RectProp.h

@@ -1,9 +1,12 @@
 #pragma once
 
+#include "JsiSkRSXform.h"
 #include "NodeProp.h"
 #include "PointProp.h"
 
 #include <memory>
+#include <utility>
+#include <vector>
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -130,4 +133,32 @@ private:
   RectProp *_rectProp;
   RectPropFromProps *_rectPropFromProps;
 };
+
+class RectsProp : public DerivedProp<std::vector<SkRect>> {
+public:
+  explicit RectsProp(PropId name,
+                     const std::function<void(BaseNodeProp *)> &onChange)
+      : DerivedProp<std::vector<SkRect>>(onChange) {
+    _rectsProp = defineProperty<NodeProp>(name);
+  }
+
+  void updateDerivedValue() override {
+    if (_rectsProp->isSet()) {
+      auto rects = _rectsProp->value().getAsArray();
+      std::vector<SkRect> derivedRects;
+      derivedRects.reserve(rects.size());
+
+      for (size_t i = 0; i < rects.size(); ++i) {
+        derivedRects.push_back(*RectProp::processRect(rects[i]));
+      }
+      setDerivedValue(std::move(derivedRects));
+    } else {
+      setDerivedValue(nullptr);
+    }
+  }
+
+private:
+  NodeProp *_rectsProp;
+};
+
 } // namespace RNSkia

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

@@ -0,0 +1,23 @@
+/*
+ * 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 AHardwareBufferUtils_DEFINED
+#define AHardwareBufferUtils_DEFINED
+
+#include "include/core/SkColorType.h"
+#include "include/core/SkTypes.h"
+
+#if __ANDROID_API__ >= 26
+
+namespace AHardwareBufferUtils {
+
+SkColorType GetSkColorTypeFromBufferFormat(uint32_t bufferFormat);
+
+}  // namespace AHardwareBufferUtils
+
+#endif
+
+#endif // AHardwareBufferUtils_DEFINED

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

@@ -22,6 +22,8 @@ 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)

package/cpp/skia/include/android/graphite/SurfaceAndroid.h

@@ -0,0 +1,59 @@
+/*
+ * 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 SurfaceAndroid_DEFINED
+#define SurfaceAndroid_DEFINED
+
+#include "include/core/SkRefCnt.h"
+
+struct AHardwareBuffer;
+class SkColorSpace;
+class SkSurface;
+class SkSurfaceProps;
+
+namespace skgpu::graphite {
+    class Recorder;
+}
+
+namespace SkSurfaces {
+
+using ReleaseContext = void*;
+using BufferReleaseProc = void (*)(ReleaseContext);
+
+/** Private; only to be used by Android Framework.
+    Creates an SkSurface from an Android hardware buffer.
+
+    Upon success bufferReleaseProc is called when it is safe to delete the buffer in the
+    backend API (accounting only for use of the buffer by this surface). If SkSurface creation
+    fails bufferReleaseProc is called before this function returns.
+
+    Currently this is only supported for buffers that can be textured as well as rendered to.
+    In other words the buffer must have both AHARDWAREBUFFER_USAGE_GPU_COLOR_OUTPUT and
+    AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE usage bits.
+
+    @param recorder          the applicable Graphite recorder
+    @param hardwareBuffer    an Android hardware buffer
+    @param colorSpace        range of colors; may be nullptr
+    @param surfaceProps      LCD striping orientation and setting for device independent
+                             fonts; may be nullptr
+    @param bufferReleaseProc function called when the buffer can be released
+    @param ReleaseContext    state passed to bufferReleaseProc
+    @param fromWindow        Whether or not the AHardwareBuffer is part of an Android Window.
+                             Currently only used with Vulkan backend.
+    @return                  created SkSurface, or nullptr
+*/
+SK_API sk_sp<SkSurface> WrapAndroidHardwareBuffer(skgpu::graphite::Recorder* recorder,
+                                                  AHardwareBuffer* hardwareBuffer,
+                                                  sk_sp<SkColorSpace> colorSpace,
+                                                  const SkSurfaceProps* surfaceProps,
+                                                  BufferReleaseProc = nullptr,
+                                                  ReleaseContext = nullptr,
+                                                  bool fromWindow = false);
+
+}  // namespace SkSurfaces
+
+#endif // SurfaceAndroid_DEFINED

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

@@ -35,7 +35,7 @@ SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
 
-inline SkCodecs::Decoder Decoder() {
+inline constexpr SkCodecs::Decoder Decoder() {
     return { "avif", IsAvif, Decode };
 }
 

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

@@ -35,7 +35,7 @@ SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
 
-inline SkCodecs::Decoder Decoder() {
+inline constexpr SkCodecs::Decoder Decoder() {
     return { "bmp", IsBmp, Decode };
 }
 

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

@@ -14,6 +14,7 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSize.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkTypes.h"
 #include "include/core/SkYUVAPixmaps.h"
 #include "include/private/SkEncodedInfo.h"
@@ -23,7 +24,7 @@
 #include <cstddef>
 #include <functional>
 #include <memory>
-#include <string>
+#include <string_view>
 #include <tuple>
 #include <vector>
 
@@ -46,6 +47,10 @@ namespace DM {
 class CodecSrc;
 } // namespace DM
 
+namespace SkCodecs {
+struct Decoder;
+}
+
 /**
  *  Abstraction layer directly on top of an image codec.
  */
@@ -175,7 +180,15 @@ public:
      *  SkCodec takes ownership of it, and will delete it when done with it.
      */
     static std::unique_ptr<SkCodec> MakeFromStream(
-            std::unique_ptr<SkStream>, Result* = nullptr,
+            std::unique_ptr<SkStream>,
+            SkSpan<const SkCodecs::Decoder> decoders,
+            Result* = nullptr,
+            SkPngChunkReader* = nullptr,
+            SelectionPolicy selectionPolicy = SelectionPolicy::kPreferStillImage);
+    // deprecated
+    static std::unique_ptr<SkCodec> MakeFromStream(
+            std::unique_ptr<SkStream>,
+            Result* = nullptr,
             SkPngChunkReader* = nullptr,
             SelectionPolicy selectionPolicy = SelectionPolicy::kPreferStillImage);
 
@@ -195,6 +208,10 @@ public:
      *      If the PNG does not contain unknown chunks, the SkPngChunkReader
      *      will not be used or modified.
      */
+    static std::unique_ptr<SkCodec> MakeFromData(sk_sp<SkData>,
+                                                 SkSpan<const SkCodecs::Decoder> decoders,
+                                                 SkPngChunkReader* = nullptr);
+    // deprecated
     static std::unique_ptr<SkCodec> MakeFromData(sk_sp<SkData>, SkPngChunkReader* = nullptr);
 
     virtual ~SkCodec();
@@ -1012,6 +1029,7 @@ private:
     friend class SkSampledCodec;
     friend class SkIcoCodec;
     friend class SkAndroidCodec; // for fEncodedInfo
+    friend class SkPDFBitmap; // for fEncodedInfo
 };
 
 namespace SkCodecs {
@@ -1025,7 +1043,7 @@ using MakeFromStreamCallback = std::unique_ptr<SkCodec> (*)(std::unique_ptr<SkSt
 struct SK_API Decoder {
     // By convention, we use all lowercase letters and go with the primary filename extension.
     // For example "png", "jpg", "ico", "webp", etc
-    std::string id;
+    std::string_view id;
     IsFormatCallback isFormat;
     MakeFromStreamCallback makeFromStream;
 };

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

@@ -35,7 +35,7 @@ SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
 
-inline SkCodecs::Decoder Decoder() {
+inline constexpr SkCodecs::Decoder Decoder() {
     return { "gif", IsGif, Decode };
 }
 

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

@@ -35,7 +35,7 @@ SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
 
-inline SkCodecs::Decoder Decoder() {
+inline constexpr SkCodecs::Decoder Decoder() {
     return { "ico", IsIco, Decode };
 }
 

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

@@ -35,7 +35,7 @@ SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
 
-inline SkCodecs::Decoder Decoder() {
+inline constexpr SkCodecs::Decoder Decoder() {
     return { "jpeg", IsJpeg, Decode };
 }
 

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

@@ -35,7 +35,7 @@ SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
 
-inline SkCodecs::Decoder Decoder() {
+inline constexpr SkCodecs::Decoder Decoder() {
     return { "jpegxl", IsJpegxl, Decode };
 }
 

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

@@ -35,7 +35,7 @@ SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
 
-inline SkCodecs::Decoder Decoder() {
+inline constexpr SkCodecs::Decoder Decoder() {
     return { "png", IsPng, Decode };
 }
 

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

@@ -41,7 +41,7 @@ SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
                                        SkCodecs::DecodeContext = nullptr);
 
 // This decoder will always be checked last, no matter when it is registered.
-inline SkCodecs::Decoder Decoder() {
+inline constexpr SkCodecs::Decoder Decoder() {
     return { "raw", IsRaw, Decode };
 }
 

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

@@ -35,7 +35,7 @@ SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
 
-inline SkCodecs::Decoder Decoder() {
+inline constexpr SkCodecs::Decoder Decoder() {
     return { "wbmp", IsWbmp, Decode };
 }
 

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

@@ -35,7 +35,7 @@ SK_API std::unique_ptr<SkCodec> Decode(sk_sp<SkData>,
                                        SkCodec::Result*,
                                        SkCodecs::DecodeContext = nullptr);
 
-inline SkCodecs::Decoder Decoder() {
+inline constexpr SkCodecs::Decoder Decoder() {
     return { "webp", IsWebp, Decode };
 }
 

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

@@ -94,6 +94,9 @@
 //#define SK_HISTOGRAM_EXACT_LINEAR(name, sample, value_max)
 //#define SK_HISTOGRAM_MEMORY_KB(name, sample)
 
+// To use smaller but slower mipmap builder
+//#define SK_USE_DRAWING_MIPMAP_DOWNSAMPLER
+
 /* Skia tries to make use of some non-standard C++ language extensions.
    By default, Skia provides msvc and clang/gcc versions of these macros.
    Skia consumers can provide their own definitions of these macros to
@@ -115,5 +118,4 @@
  */
 //#define SK_API __declspec(dllexport)
 
-
 #endif