@shopify/react-native-skia 2.11.0-next.1 → 2.12.0-next.1

package/cpp/dawn/include/webgpu/webgpu_cpp_chained_struct.h

@@ -26,7 +26,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifdef __EMSCRIPTEN__
-#error "Do not include this header. Emscripten already provides headers needed for WebGPU."
+#error "Do not include this header. Use the headers provided by Emdawnwebgpu instead."
 #endif
 
 #ifndef WEBGPU_CPP_CHAINED_STRUCT_H_

package/cpp/dawn/include/webgpu/webgpu_enum_class_bitmasks.h

@@ -65,9 +65,10 @@ template <typename T>
 struct BoolConvertible {
     using Integral = typename std::underlying_type<T>::type;
 
-    // NOLINTNEXTLINE(runtime/explicit)
     explicit constexpr BoolConvertible(Integral value) : value(value) {}
+    // NOLINTNEXTLINE(google-explicit-constructor)
     constexpr operator bool() const { return value != 0; }
+    // NOLINTNEXTLINE(google-explicit-constructor)
     constexpr operator T() const { return static_cast<T>(value); }
 
     Integral value;

package/cpp/jsi/EnumMapper.h

@@ -3,7 +3,7 @@
 #include <stdexcept>
 #include <string>
 
-namespace rnwgpu {
+namespace RNJsi {
 
 namespace EnumMapper {
 // Add these two methods in namespace "EnumMapper" to allow parsing a custom
@@ -60,4 +60,4 @@ static void convertEnumToJSUnion(TEnum, std::string *) {
 }
 } // namespace EnumMapper
 
-} // namespace rnwgpu
+} // namespace RNJsi

package/cpp/jsi/JSIConverter.h

@@ -25,7 +25,7 @@
 #include <cxxabi.h>
 #endif
 
-namespace rnwgpu {
+namespace RNJsi {
 
 namespace jsi = facebook::jsi;
 
@@ -495,4 +495,4 @@ template <> struct JSIConverter<std::unordered_set<std::string>> {
   }
 };
 
-} // namespace rnwgpu
+} // namespace RNJsi

package/cpp/jsi/NativeObject.h

@@ -18,14 +18,14 @@
 #include "jsi/RuntimeAwareCache.h" // Use Skia's RuntimeAwareCache
 
 // Forward declare to avoid circular dependency
-namespace rnwgpu {
+namespace RNJsi {
 template <typename ArgType, typename SFINAE> struct JSIConverter;
-} // namespace rnwgpu
+} // namespace RNJsi
 
 // Include the converter - must come after forward declaration
 #include "JSIConverter.h"
 
-namespace rnwgpu {
+namespace RNJsi {
 
 namespace jsi = facebook::jsi;
 
@@ -452,7 +452,7 @@ protected:
             return jsi::Value::undefined();
           } else {
             ReturnType result = (native.get()->*getter)();
-            return rnwgpu::JSIConverter<std::decay_t<ReturnType>>::toJSI(
+            return RNJsi::JSIConverter<std::decay_t<ReturnType>>::toJSI(
                 rt, std::move(result));
           }
         });
@@ -487,7 +487,7 @@ protected:
             throw jsi::JSError(rt, "Setter requires a value argument");
           }
           auto native = NativeObject<Derived>::fromValue(rt, thisVal);
-          auto value = rnwgpu::JSIConverter<std::decay_t<ValueType>>::fromJSI(
+          auto value = RNJsi::JSIConverter<std::decay_t<ValueType>>::fromJSI(
               rt, args[0], false);
           (native.get()->*setter)(std::move(value));
           return jsi::Value::undefined();
@@ -535,7 +535,7 @@ protected:
                  const jsi::Value *args, size_t count) -> jsi::Value {
           auto native = NativeObject<Derived>::fromValue(rt, thisVal);
           ReturnType result = (native.get()->*getter)();
-          return rnwgpu::JSIConverter<std::decay_t<ReturnType>>::toJSI(
+          return RNJsi::JSIConverter<std::decay_t<ReturnType>>::toJSI(
               rt, std::move(result));
         });
 
@@ -548,7 +548,7 @@ protected:
             throw jsi::JSError(rt, "Setter requires a value argument");
           }
           auto native = NativeObject<Derived>::fromValue(rt, thisVal);
-          auto value = rnwgpu::JSIConverter<std::decay_t<ValueType>>::fromJSI(
+          auto value = RNJsi::JSIConverter<std::decay_t<ValueType>>::fromJSI(
               rt, args[0], false);
           (native.get()->*setter)(std::move(value));
           return jsi::Value::undefined();
@@ -579,9 +579,9 @@ private:
                         jsi::Runtime &runtime, const jsi::Value *args,
                         std::index_sequence<Is...>, size_t count) {
     ReturnType result = (obj->*method)(
-        runtime, rnwgpu::JSIConverter<std::decay_t<Args>>::fromJSI(
+        runtime, RNJsi::JSIConverter<std::decay_t<Args>>::fromJSI(
                      runtime, args[Is], Is >= count)...);
-    return rnwgpu::JSIConverter<std::decay_t<ReturnType>>::toJSI(
+    return RNJsi::JSIConverter<std::decay_t<ReturnType>>::toJSI(
         runtime, std::move(result));
   }
 
@@ -592,7 +592,7 @@ private:
                                jsi::Runtime &runtime, const jsi::Value *args,
                                std::index_sequence<Is...>, size_t count) {
     if constexpr (std::is_same_v<ReturnType, void>) {
-      (obj->*method)(rnwgpu::JSIConverter<std::decay_t<Args>>::fromJSI(
+      (obj->*method)(RNJsi::JSIConverter<std::decay_t<Args>>::fromJSI(
           runtime, args[Is], Is >= count)...);
       return jsi::Value::undefined();
     } else if constexpr (std::is_same_v<ReturnType, jsi::Value>) {
@@ -601,9 +601,9 @@ private:
       return (obj->*method)(runtime, jsi::Value::undefined(), args, count);
     } else {
       ReturnType result =
-          (obj->*method)(rnwgpu::JSIConverter<std::decay_t<Args>>::fromJSI(
+          (obj->*method)(RNJsi::JSIConverter<std::decay_t<Args>>::fromJSI(
               runtime, args[Is], Is >= count)...);
-      return rnwgpu::JSIConverter<std::decay_t<ReturnType>>::toJSI(
+      return RNJsi::JSIConverter<std::decay_t<ReturnType>>::toJSI(
           runtime, std::move(result));
     }
   }
@@ -616,4 +616,4 @@ template <typename T>
 struct is_native_object<std::shared_ptr<T>>
     : std::bool_constant<std::is_base_of_v<NativeObject<T>, T>> {};
 
-} // namespace rnwgpu
+} // namespace RNJsi

package/cpp/jsi/Promise.cpp

@@ -6,7 +6,7 @@
 #include <utility>
 #include <vector>
 
-namespace rnwgpu {
+namespace RNJsi {
 
 namespace jsi = facebook::jsi;
 
@@ -45,4 +45,4 @@ void Promise::reject(std::string message) {
   _rejecter.call(runtime, error.value());
 }
 
-} // namespace rnwgpu
+} // namespace RNJsi

package/cpp/jsi/Promise.h

@@ -6,7 +6,7 @@
 #include <utility>
 #include <vector>
 
-namespace rnwgpu {
+namespace RNJsi {
 
 namespace jsi = facebook::jsi;
 
@@ -34,4 +34,4 @@ public:
   static jsi::Value createPromise(jsi::Runtime &runtime, RunPromise run);
 };
 
-} // namespace rnwgpu
+} // namespace RNJsi

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

@@ -39,8 +39,6 @@ public:
 
     static void SafetyNetLog(const char*);
 
-    static sk_sp<SkSurface> getSurfaceFromCanvas(SkCanvas* canvas);
-
     static int SaveBehind(SkCanvas* canvas, const SkRect* subset);
 
     // Operating within the canvas' clip stack, this resets the geometry of the clip to be wide

package/cpp/skia/include/android/vk/AndroidVulkanMemoryAllocator.h

@@ -9,7 +9,7 @@
 #define AndroidVulkanMemoryAllocator_DEFINED
 
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 namespace skgpu {
 struct VulkanBackendContext;

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

@@ -15,7 +15,7 @@
 #include "include/core/SkSize.h"
 #include "include/core/SkTypes.h"
 #include "include/private/SkEncodedInfo.h"
-#include "include/private/base/SkNoncopyable.h"
+#include "include/private/SkNoncopyable.h"
 #include "modules/skcms/skcms.h"
 
 // TODO(kjlubick, bungeman) Replace these includes with forward declares

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkBmpRustDecoder_DEFINED
+#define SkBmpRustDecoder_DEFINED
+
+#include "include/codec/SkCodec.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/SkAPI.h"
+
+class SkData;
+class SkStream;
+
+#include <memory>
+
+namespace SkBmpRustDecoder {
+
+/** Returns true if this data claims to be a BMP image. */
+SK_API bool IsBmp(const void*, size_t);
+
+/**
+ *  Attempts to decode the given bytes as a BMP using Rust implementation.
+ *
+ *  If the bytes are not a BMP, returns nullptr.
+ */
+SK_API std::unique_ptr<SkCodec> Decode(std::unique_ptr<SkStream>,
+                                       SkCodec::Result*,
+                                       SkCodecs::DecodeContext = nullptr);
+SK_API std::unique_ptr<SkCodec> Decode(sk_sp<const SkData>,
+                                       SkCodec::Result*,
+                                       SkCodecs::DecodeContext = nullptr);
+
+inline constexpr SkCodecs::Decoder Decoder() {
+    return { "rust_bmp", IsBmp, Decode };
+}
+
+}  // namespace SkBmpRustDecoder
+
+#endif  // SkBmpRustDecoder_DEFINED

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

@@ -19,7 +19,7 @@
 #include "include/core/SkYUVAPixmaps.h"
 #include "include/private/SkEncodedInfo.h"
 #include "include/private/SkHdrMetadata.h"
-#include "include/private/base/SkNoncopyable.h"
+#include "include/private/SkNoncopyable.h"
 #include "modules/skcms/skcms.h"
 
 #include <cstddef>
@@ -1129,7 +1129,8 @@ private:
     friend class PNGCodecGM;    // for fillIncompleteImage
     friend class SkSampledCodec;
     friend class SkIcoCodec;
-    friend class SkPngCodec;     // for onGetGainmapCodec
+    friend class SkIcoRustCodec;  // for getEncodedInfo and getSampler
+    friend class SkPngCodecBase;  // for onGetGainmapCodec
     friend class SkAndroidCodec;  // for handleFrameIndex
     friend class SkCodecPriv;     // for fEncodedInfo
 };

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -10,7 +10,7 @@
 
 #include "include/codec/SkEncodedOrigin.h"
 #include "include/core/SkImageInfo.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkPixmap;
 

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -10,7 +10,7 @@
 #include <memory>
 
 #include "include/codec/SkCodec.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkStream;
 

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -18,8 +18,8 @@
 #include "include/core/SkSamplingOptions.h"
 #include "include/core/SkSize.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkCPUTypes.h"
-#include "include/private/base/SkDebug.h"
+#include "include/private/SkCPUTypes.h"
+#include "include/private/SkDebug.h"
 
 #include <cstddef>
 #include <cstdint>
@@ -205,7 +205,7 @@ public:
 
         @return  true if dimensions do not enclose area
     */
-    bool empty() const { return fPixmap.info().isEmpty(); }
+    bool empty() const { return fPixmap.isEmpty(); }
 
     /** Returns true if SkPixelRef is nullptr.
 

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

@@ -7,7 +7,7 @@
 #ifndef skcpu_Context_DEFINED
 #define skcpu_Context_DEFINED
 
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 #include <memory>
 

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

@@ -11,10 +11,9 @@
 #include <cstdint>
 #include "include/core/SkRecorder.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkCanvas;
-class SkContentID;
 class SkSurface;
 class SkSurfaceProps;
 struct SkImageInfo;
@@ -59,7 +58,7 @@ public:
 private:
     // TODO (b/412351769): Implement this so we can capture from a CPU Recorder.
     SkCanvas* makeCaptureCanvas(SkCanvas*) final { return nullptr; }
-    SkContentID createCaptureBreakpoint(SkSurface*) final;
+    void createCaptureBreakpoint(SkSurface*) final;
 };
 
 inline Recorder* AsRecorder(SkRecorder* recorder) {

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

@@ -31,9 +31,10 @@
 #include "include/core/SkSurfaceProps.h"
 #include "include/core/SkTileMode.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkCPUTypes.h"
-#include "include/private/base/SkDeque.h"
-#include "include/private/base/SkTArray.h"
+#include "include/private/SkCPUTypes.h"
+#include "include/private/SkDeque.h"
+#include "include/private/SkEnumBitMask.h"
+#include "include/private/SkTArray.h"
 
 #include <cstddef>
 #include <cstdint>
@@ -45,11 +46,6 @@
 #define SK_SUPPORT_LEGACY_GETTOTALMATRIX
 #endif
 
-namespace sktext {
-class GlyphRunBuilder;
-class GlyphRunList;
-}
-
 class AutoLayerForImageFilter;
 class GrRecordingContext;
 
@@ -81,6 +77,12 @@ struct SkDrawShadowRec;
 template<typename E>
 class SkEnumBitMask;
 
+namespace sktext {
+class GlyphRunBuilder;
+class GlyphRun;
+class GlyphRunList;
+}  // namespace sktext
+
 namespace skgpu::graphite { class Recorder; }
 namespace sktext::gpu { class Slug; }
 namespace SkRecords { class Draw; }
@@ -2415,11 +2417,7 @@ private:
         kCheckForOverwrite       = 4, // Check if the draw would overwrite the entire surface
         kSkipMaskFilterAutoLayer = 8, // Do not apply mask filters in the AutoLayer
     };
-    // Inlined SK_DECL_BITMASK_OPS_FRIENDS to avoid including SkEnumBitMask.h
-    friend constexpr SkEnumBitMask<PredrawFlags> operator|(PredrawFlags, PredrawFlags);
-    friend constexpr SkEnumBitMask<PredrawFlags> operator&(PredrawFlags, PredrawFlags);
-    friend constexpr SkEnumBitMask<PredrawFlags> operator^(PredrawFlags, PredrawFlags);
-    friend constexpr SkEnumBitMask<PredrawFlags> operator~(PredrawFlags);
+    SK_DECL_BITMASK_OPS_FRIENDS(PredrawFlags)
 
     // notify our surface (if we have one) that we are about to draw, so it
     // can perform copy-on-write or invalidate any cached images
@@ -2531,12 +2529,13 @@ private:
     std::unique_ptr<SkRasterHandleAllocator> fAllocator;
 
     SkSurface_Base*  fSurfaceBase;
-    SkSurface_Base* getSurfaceBase() const { return fSurfaceBase; }
+    virtual SkSurface_Base* getSurfaceBase() const { return fSurfaceBase; }
     void setSurfaceBase(SkSurface_Base* sb) {
         fSurfaceBase = sb;
     }
     friend class SkSurface_Base;
     friend class SkSurface_Ganesh;
+    friend class SkCaptureCanvas;
 
     SkIRect fClipRestrictionRect = SkIRect::MakeEmpty();
     int fClipRestrictionSaveCount = -1;
@@ -2559,6 +2558,7 @@ private:
     friend class SkRecords::Draw;
     template <typename Key>
     friend class skiatest::TestCanvas;
+    friend class AutoGlyphRunBuilder;
 
 protected:
     // For use by SkNoDrawCanvas (via SkCanvasVirtualEnforcer, which can't be a friend)
@@ -2704,7 +2704,15 @@ private:
     class AutoUpdateQRBounds;
     void validateClip() const;
 
-    std::unique_ptr<sktext::GlyphRunBuilder> fScratchGlyphRunBuilder;
+    sktext::GlyphRunBuilder* obtainGlyphRunBuilder();
+
+    void releaseGlyphRunBuilder();
+
+    /**
+     * fRunBuilders will be reused across text drawing commands
+     */
+    skia_private::STArray<1, std::unique_ptr<sktext::GlyphRunBuilder>> fRunBuilders;
+    int fRunBuildersUsed = 0;
 };
 
 /** \class SkAutoCanvasRestore

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

@@ -11,8 +11,8 @@
 #include "include/core/SkAlphaType.h"
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkCPUTypes.h"
-#include "include/private/base/SkTPin.h"
+#include "include/private/SkCPUTypes.h"
+#include "include/private/SkTPin.h"
 
 #include <array>
 #include <cstdint>

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

@@ -11,7 +11,7 @@
 #include "include/core/SkColor.h"
 #include "include/core/SkFlattenable.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 #include <cstddef>
 #include <cstdint>

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

@@ -10,8 +10,8 @@
 
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkFixed.h"
-#include "include/private/base/SkOnce.h"
+#include "include/private/SkFixed.h"
+#include "include/private/SkOnce.h"
 #include "modules/skcms/skcms.h"
 
 #include <cstddef>

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

@@ -10,7 +10,7 @@
 
 #include "include/core/SkBitmap.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 #include <cstdint>
 

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

@@ -14,7 +14,7 @@
 #include "include/core/SkScalar.h"
 #include "include/core/SkSpan.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkTDArray.h"
+#include "include/private/SkTDArray.h"
 
 #include <cstddef>
 #include <memory>

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

@@ -10,7 +10,7 @@
 
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSpan.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 #include <cstddef>
 #include <cstdint>

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

@@ -9,8 +9,8 @@
 #define SkDataTable_DEFINED
 
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
-#include "include/private/base/SkAssert.h"
+#include "include/private/SkAPI.h"
+#include "include/private/SkAssert.h"
 
 #include <cstdint>
 #include <cstring>

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

@@ -10,7 +10,7 @@
 
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkCanvas;
 class SkWStream;

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

@@ -11,7 +11,7 @@
 #include "include/core/SkFlattenable.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 #include <cstddef>
 #include <cstdint>

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

@@ -16,8 +16,8 @@
 #include "include/core/SkSpan.h"
 #include "include/core/SkTypeface.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkTo.h"
-#include "include/private/base/SkTypeTraits.h"
+#include "include/private/SkTo.h"
+#include "include/private/SkTypeTraits.h"
 
 #include <cstddef>
 #include <cstdint>

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

@@ -9,7 +9,7 @@
 #define SkFontMetrics_DEFINED
 
 #include "include/core/SkScalar.h"
-#include "include/private/base/SkTo.h"
+#include "include/private/SkTo.h"
 
 /** \class SkFontMetrics
     The metrics of an SkFont.