@shopify/react-native-skia 2.11.0-next.2 → 2.11.1

package/cpp/skia/include/gpu/graphite/precompile/PrecompileImageFilter.h

@@ -12,7 +12,7 @@
 
 #include "include/core/SkBlendMode.h"
 #include "include/gpu/graphite/precompile/PaintOptions.h"
-#include "include/private/base/SkTemplates.h"
+#include "include/private/SkTemplates.h"
 
 namespace skgpu::graphite {
 

package/cpp/skia/include/gpu/graphite/vk/VulkanGraphiteContext.h

@@ -10,7 +10,7 @@
 
 #include <memory>
 
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 // NOTE: Because there is already a VulkanBackendContext header shared between Ganesh and Graphite,
 // this is named VulkanGraphiteContext.h to supply just the factory function (differing from the

package/cpp/skia/include/gpu/vk/VulkanBackendContext.h

@@ -12,7 +12,7 @@
 #include "include/gpu/GpuTypes.h"
 #include "include/gpu/vk/VulkanMemoryAllocator.h"
 #include "include/gpu/vk/VulkanTypes.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 #include "include/private/gpu/vk/SkiaVulkan.h"
 
 #include <cstdint>

package/cpp/skia/include/gpu/vk/VulkanExtensions.h

@@ -10,9 +10,9 @@
 
 #include "include/core/SkString.h"
 #include "include/gpu/vk/VulkanTypes.h"
-#include "include/private/base/SkAPI.h"
-#include "include/private/base/SkDebug.h"
-#include "include/private/base/SkTArray.h"
+#include "include/private/SkAPI.h"
+#include "include/private/SkDebug.h"
+#include "include/private/SkTArray.h"
 #include "include/private/gpu/vk/SkiaVulkan.h"
 
 #include <cstdint>

package/cpp/skia/include/gpu/vk/VulkanMutableTextureState.h

@@ -9,7 +9,7 @@
 #define skgpu_VulkanMutableTextureState_DEFINED
 
 #include "include/gpu/MutableTextureState.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 #include "include/private/gpu/vk/SkiaVulkan.h"
 
 #include <cstdint>

package/cpp/skia/include/gpu/vk/VulkanPreferredFeatures.h

@@ -8,7 +8,7 @@
 #ifndef skgpu_VulkanPreferredFeatures_DEFINED
 #define skgpu_VulkanPreferredFeatures_DEFINED
 
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 #include "include/private/gpu/vk/SkiaVulkan.h"
 
 #include <cstddef>

package/cpp/skia/include/gpu/vk/VulkanTypes.h

@@ -9,7 +9,7 @@
 #define skgpu_VulkanTypes_DEFINED
 
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkTo.h"
+#include "include/private/SkTo.h"
 #include "include/private/gpu/vk/SkiaVulkan.h"
 
 #include <cstddef>

package/cpp/skia/include/pathops/SkPathOps.h

@@ -9,8 +9,8 @@
 
 #include "include/core/SkPath.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkTArray.h"
-#include "include/private/base/SkTDArray.h"
+#include "include/private/SkTArray.h"
+#include "include/private/SkTDArray.h"
 
 #include <optional>
 

package/cpp/skia/include/ports/SkImageGeneratorCG.h

@@ -9,14 +9,14 @@
 
 // This is needed as clients may override the target platform
 // using SkUserConfig
-#include "include/private/base/SkLoadUserConfig.h"
+#include "include/private/SkLoadUserConfig.h"
 
 #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
 
 #include "include/core/SkData.h"
 #include "include/core/SkImageGenerator.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 #include <memory>
 

package/cpp/skia/include/ports/SkImageGeneratorWIC.h

@@ -8,14 +8,14 @@
 #ifndef SkImageGeneratorWIC_DEFINED
 #define SkImageGeneratorWIC_DEFINED
 
-#include "include/private/base/SkFeatures.h"
+#include "include/private/SkFeatures.h"
 
 #if defined(SK_BUILD_FOR_WIN)
 
 #include "include/core/SkData.h"
 #include "include/core/SkImageGenerator.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 #include <memory>
 

package/cpp/skia/include/private/{base/SingleOwner.h → SingleOwner.h}

@@ -8,13 +8,13 @@
 #ifndef skgpu_SingleOwner_DEFINED
 #define skgpu_SingleOwner_DEFINED
 
-#include "include/private/base/SkDebug.h" // IWYU pragma: keep
+#include "include/private/SkDebug.h" // IWYU pragma: keep
 
 #if defined(SK_DEBUG)
-#include "include/private/base/SkAssert.h"
-#include "include/private/base/SkMutex.h"
-#include "include/private/base/SkThreadAnnotations.h"
-#include "include/private/base/SkThreadID.h"
+#include "include/private/SkAssert.h"
+#include "include/private/SkMutex.h"
+#include "include/private/SkThreadAnnotations.h"
+#include "include/private/SkThreadID.h"
 
 #endif
 

package/cpp/skia/include/private/{base/SkAPI.h → SkAPI.h}

@@ -8,7 +8,7 @@
 #ifndef SkAPI_DEFINED
 #define SkAPI_DEFINED
 
-#include "include/private/base/SkLoadUserConfig.h" // IWYU pragma: keep
+#include "include/private/SkLoadUserConfig.h" // IWYU pragma: keep
 
 // If SKIA_IMPLEMENTATION is defined as 1, that signals we are building Skia and should
 // export our symbols. If it is not set (or set to 0), then Skia is being used by a client

package/cpp/skia/include/private/{base/SkAlign.h → SkAlign.h}

@@ -8,7 +8,7 @@
 #ifndef SkAlign_DEFINED
 #define SkAlign_DEFINED
 
-#include "include/private/base/SkAssert.h"
+#include "include/private/SkAssert.h"
 
 #include <cstddef>
 

package/cpp/skia/include/private/{base/SkAnySubclass.h → SkAnySubclass.h}

@@ -8,7 +8,7 @@
 #ifndef SkAnySubclass_DEFINED
 #define SkAnySubclass_DEFINED
 
-#include "include/private/base/SkAssert.h"
+#include "include/private/SkAssert.h"
 
 #include <cstddef>
 #include <new>

package/cpp/skia/include/private/{base/SkAssert.h → SkAssert.h}

@@ -8,10 +8,10 @@
 #ifndef SkAssert_DEFINED
 #define SkAssert_DEFINED
 
-#include "include/private/base/SkAPI.h"
-#include "include/private/base/SkAttributes.h"
-#include "include/private/base/SkDebug.h" // IWYU pragma: keep
-#include "include/private/base/SkLog.h"
+#include "include/private/SkAPI.h"
+#include "include/private/SkAttributes.h"
+#include "include/private/SkDebug.h" // IWYU pragma: keep
+#include "include/private/SkLog.h"
 
 #include <cstddef>
 #include <limits>

package/cpp/skia/include/private/{base/SkAttributes.h → SkAttributes.h}

@@ -8,8 +8,8 @@
 #ifndef SkAttributes_DEFINED
 #define SkAttributes_DEFINED
 
-#include "include/private/base/SkFeatures.h" // IWYU pragma: keep
-#include "include/private/base/SkLoadUserConfig.h" // IWYU pragma: keep
+#include "include/private/SkFeatures.h" // IWYU pragma: keep
+#include "include/private/SkLoadUserConfig.h" // IWYU pragma: keep
 
 #if defined(__clang__) || defined(__GNUC__)
 #  define SK_ATTRIBUTE(attr) __attribute__((attr))

package/cpp/skia/include/private/{base/SkContainers.h → SkContainers.h}

@@ -4,9 +4,9 @@
 #ifndef SkContainers_DEFINED
 #define SkContainers_DEFINED
 
-#include "include/private/base/SkAPI.h"
-#include "include/private/base/SkAlign.h"
-#include "include/private/base/SkSpan_impl.h"
+#include "include/core/SkSpan.h"
+#include "include/private/SkAPI.h"
+#include "include/private/SkAlign.h"
 
 #include <cstddef>
 #include <cstdint>

package/cpp/skia/include/private/{base/SkDebug.h → SkDebug.h}

@@ -8,9 +8,9 @@
 #ifndef SkDebug_DEFINED
 #define SkDebug_DEFINED
 
-#include "include/private/base/SkAPI.h"
-#include "include/private/base/SkAttributes.h"
-#include "include/private/base/SkLoadUserConfig.h" // IWYU pragma: keep
+#include "include/private/SkAPI.h"
+#include "include/private/SkAttributes.h"
+#include "include/private/SkLoadUserConfig.h" // IWYU pragma: keep
 
 #if !defined(SkDebugf)
     void SK_SPI SkDebugf(const char format[], ...) SK_PRINTF_LIKE(1, 2);

package/cpp/skia/include/private/{base/SkDeque.h → SkDeque.h}

@@ -10,7 +10,7 @@
 #ifndef SkDeque_DEFINED
 #define SkDeque_DEFINED
 
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 #include <cstddef>
 

package/cpp/skia/include/private/SkEncodedInfo.h

@@ -15,9 +15,9 @@
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkTypes.h"
+#include "include/private/SkAPI.h"
 #include "include/private/SkHdrMetadata.h"
-#include "include/private/base/SkAPI.h"
-#include "include/private/base/SkTo.h"
+#include "include/private/SkTo.h"
 #include "modules/skcms/skcms.h"
 
 #include <cstdint>

package/cpp/skia/include/private/SkEnumBitMask.h

@@ -0,0 +1,92 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkEnumBitMask_DEFINED
+#define SkEnumBitMask_DEFINED
+
+#include "include/private/SkAttributes.h"
+
+#include <type_traits>
+
+/**
+ * Wraps an enum that is used for flags, and enables masking with type safety. Example:
+ *
+ *   enum class MyFlags {
+ *       kNone = 0,
+ *       kA = 1,
+ *       kB = 2,
+ *       kC = 4,
+ *   };
+ *
+ *   SK_MAKE_BITMASK_OPS(MyFlags)
+ *
+ *   ...
+ *
+ *       SkEnumBitMask<MyFlags> flags = MyFlags::kA | MyFlags::kB;
+ *
+ *       if (flags & MyFlags::kB) {}
+ *
+ *   ...
+ */
+template<typename E>
+class SkEnumBitMask {
+    using I = std::underlying_type_t<E>;
+public:
+    SK_ALWAYS_INLINE constexpr SkEnumBitMask() : SkEnumBitMask(I(0)) {}
+    SK_ALWAYS_INLINE constexpr SkEnumBitMask(E e) : SkEnumBitMask(static_cast<I>(e)) {}
+
+    SK_ALWAYS_INLINE constexpr explicit operator bool() const { return fValue; }
+    SK_ALWAYS_INLINE constexpr I value() const                { return fValue; }
+
+    SK_ALWAYS_INLINE constexpr bool operator==(SkEnumBitMask m) const { return fValue == m.fValue; }
+    SK_ALWAYS_INLINE constexpr bool operator!=(SkEnumBitMask m) const { return fValue != m.fValue; }
+
+    SK_ALWAYS_INLINE constexpr SkEnumBitMask operator|(SkEnumBitMask m) const {
+        return SkEnumBitMask(fValue | m.fValue);
+    }
+    SK_ALWAYS_INLINE constexpr SkEnumBitMask operator&(SkEnumBitMask m) const {
+        return SkEnumBitMask(fValue & m.fValue);
+    }
+    SK_ALWAYS_INLINE constexpr SkEnumBitMask operator^(SkEnumBitMask m) const {
+        return SkEnumBitMask(fValue ^ m.fValue);
+    }
+    SK_ALWAYS_INLINE constexpr SkEnumBitMask operator~() const { return SkEnumBitMask(~fValue); }
+
+    SK_ALWAYS_INLINE SkEnumBitMask& operator|=(SkEnumBitMask m) { return *this = *this | m; }
+    SK_ALWAYS_INLINE SkEnumBitMask& operator&=(SkEnumBitMask m) { return *this = *this & m; }
+    SK_ALWAYS_INLINE SkEnumBitMask& operator^=(SkEnumBitMask m) { return *this = *this ^ m; }
+
+private:
+    SK_ALWAYS_INLINE constexpr explicit SkEnumBitMask(I value) : fValue(value) {}
+
+    I fValue;
+};
+
+/**
+ * Defines functions that make it possible to use bitwise operators on an enum.
+ */
+#define SK_MAKE_BITMASK_OPS(E)                                        \
+    [[maybe_unused]] constexpr SkEnumBitMask<E> operator|(E a, E b) { \
+        return SkEnumBitMask<E>(a) | b;                               \
+    }                                                                 \
+    [[maybe_unused]] constexpr SkEnumBitMask<E> operator&(E a, E b) { \
+        return SkEnumBitMask<E>(a) & b;                               \
+    }                                                                 \
+    [[maybe_unused]] constexpr SkEnumBitMask<E> operator^(E a, E b) { \
+        return SkEnumBitMask<E>(a) ^ b;                               \
+    }                                                                 \
+    [[maybe_unused]] constexpr SkEnumBitMask<E> operator~(E e) {      \
+        return ~SkEnumBitMask<E>(e);                                  \
+    }
+
+#define SK_DECL_BITMASK_OPS_FRIENDS(E)                 \
+    friend constexpr SkEnumBitMask<E> operator|(E, E); \
+    friend constexpr SkEnumBitMask<E> operator&(E, E); \
+    friend constexpr SkEnumBitMask<E> operator^(E, E); \
+    friend constexpr SkEnumBitMask<E> operator~(E);
+
+#endif  // SkEnumBitMask_DEFINED

package/cpp/skia/include/private/SkExif.h

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

package/cpp/skia/include/private/{base/SkFixed.h → SkFixed.h}

@@ -8,10 +8,10 @@
 #ifndef SkFixed_DEFINED
 #define SkFixed_DEFINED
 
-#include "include/private/base/SkAssert.h"
-#include "include/private/base/SkDebug.h"
-#include "include/private/base/SkMath.h" // IWYU pragma: keep
-#include "include/private/base/SkTPin.h" // IWYU pragma: keep
+#include "include/private/SkAssert.h"
+#include "include/private/SkDebug.h"
+#include "include/private/SkMath.h" // IWYU pragma: keep
+#include "include/private/SkTPin.h" // IWYU pragma: keep
 
 #include <cstdint>
 

package/cpp/skia/include/private/{base/SkFloatingPoint.h → SkFloatingPoint.h}

@@ -8,8 +8,8 @@
 #ifndef SkFloatingPoint_DEFINED
 #define SkFloatingPoint_DEFINED
 
-#include "include/private/base/SkAttributes.h"
-#include "include/private/base/SkMath.h"
+#include "include/private/SkAttributes.h"
+#include "include/private/SkMath.h"
 
 #include <cmath>
 #include <cstdint>

package/cpp/skia/include/private/SkGainmapShader.h

@@ -9,7 +9,7 @@
 #define SkGainmapShader_DEFINED
 
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkColorSpace;
 class SkShader;

package/cpp/skia/include/private/SkHdrMetadata.h

@@ -10,7 +10,7 @@
 
 #include "include/core/SkColorSpace.h"
 #include "include/core/SkData.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 #include <algorithm>
 #include <cmath>

package/cpp/skia/include/private/SkIDChangeListener.h

@@ -9,9 +9,9 @@
 #define SkIDChangeListener_DEFINED
 
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkMutex.h"
-#include "include/private/base/SkTArray.h"
-#include "include/private/base/SkThreadAnnotations.h"
+#include "include/private/SkMutex.h"
+#include "include/private/SkTArray.h"
+#include "include/private/SkThreadAnnotations.h"
 
 #include <atomic>
 

package/cpp/skia/include/private/{base/SkLoadUserConfig.h → SkLoadUserConfig.h}

@@ -8,9 +8,9 @@
 #ifndef SK_USER_CONFIG_WAS_LOADED
 
 // Include this to set reasonable defaults (e.g. for SK_CPU_LENDIAN)
-#include "include/private/base/SkFeatures.h"
+#include "include/private/SkFeatures.h"
 // Include this so that users can define the lowest active log priority in their config
-#include "include/private/base/SkLogPriority.h" // IWYU pragma: keep
+#include "include/private/SkLogPriority.h" // IWYU pragma: keep
 
 // Allows embedders that want to disable macros that take arguments to just
 // define that symbol to be one of these

package/cpp/skia/include/private/{base/SkLog.h → SkLog.h}

@@ -10,10 +10,10 @@
 
 #include <cstdarg>
 
-#include "include/private/base/SkAPI.h"
-#include "include/private/base/SkAttributes.h"
-#include "include/private/base/SkLoadUserConfig.h" // IWYU pragma: keep
-#include "include/private/base/SkLogPriority.h"
+#include "include/private/SkAPI.h"
+#include "include/private/SkAttributes.h"
+#include "include/private/SkLoadUserConfig.h" // IWYU pragma: keep
+#include "include/private/SkLogPriority.h"
 
 #if !defined(SkLog)
 // To be implemented per platform.

package/cpp/skia/include/private/{base/SkMacros.h → SkMacros.h}

@@ -7,7 +7,7 @@
 #ifndef SkMacros_DEFINED
 #define SkMacros_DEFINED
 
-#include "include/private/base/SkTo.h" // IWYU pragma: keep
+#include "include/private/SkTo.h" // IWYU pragma: keep
 
 /*
  *  Usage:  SK_MACRO_CONCAT(a, b)   to construct the symbol ab

package/cpp/skia/include/private/{base/SkMalloc.h → SkMalloc.h}

@@ -10,7 +10,7 @@
 
 #include <cstring>
 
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 /*
     memory wrappers to be implemented by the porting layer (platform)

package/cpp/skia/include/private/{base/SkMath.h → SkMath.h}

@@ -8,8 +8,8 @@
 #ifndef SkMath_DEFINED
 #define SkMath_DEFINED
 
-#include "include/private/base/SkAssert.h"
-#include "include/private/base/SkCPUTypes.h"
+#include "include/private/SkAssert.h"
+#include "include/private/SkCPUTypes.h"
 
 #include <cstdint>
 #include <climits>

package/cpp/skia/include/private/{base/SkMutex.h → SkMutex.h}

@@ -8,11 +8,11 @@
 #ifndef SkMutex_DEFINED
 #define SkMutex_DEFINED
 
-#include "include/private/base/SkAssert.h"
-#include "include/private/base/SkDebug.h"
-#include "include/private/base/SkSemaphore.h"
-#include "include/private/base/SkThreadAnnotations.h"
-#include "include/private/base/SkThreadID.h"
+#include "include/private/SkAssert.h"
+#include "include/private/SkDebug.h"
+#include "include/private/SkSemaphore.h"
+#include "include/private/SkThreadAnnotations.h"
+#include "include/private/SkThreadID.h"
 
 /**
  * class SkMutex

package/cpp/skia/include/private/{base/SkNoncopyable.h → SkNoncopyable.h}

@@ -8,7 +8,7 @@
 #ifndef SkNoncopyable_DEFINED
 #define SkNoncopyable_DEFINED
 
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 /** \class SkNoncopyable (DEPRECATED)
 

package/cpp/skia/include/private/{base/SkOnce.h → SkOnce.h}

@@ -8,7 +8,7 @@
 #ifndef SkOnce_DEFINED
 #define SkOnce_DEFINED
 
-#include "include/private/base/SkThreadAnnotations.h"
+#include "include/private/SkThreadAnnotations.h"
 
 #include <atomic>
 #include <cstdint>

package/cpp/skia/include/private/SkPathRef.h

@@ -16,12 +16,12 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkTypes.h"
+#include "include/private/SkDebug.h"
 #include "include/private/SkIDChangeListener.h"
-#include "include/private/base/SkDebug.h"
-#include "include/private/base/SkSpan_impl.h"
-#include "include/private/base/SkTArray.h"
-#include "include/private/base/SkTo.h"
+#include "include/private/SkTArray.h"
+#include "include/private/SkTo.h"
 
 #include <atomic>
 #include <cstddef>

package/cpp/skia/include/private/SkPixelStorage.h

@@ -9,27 +9,42 @@
 #define SkPixelStorage_DEFINED
 
 #include <cstdint>
+#include <atomic>
+#include "include/core/SkRefCnt.h"
 
 /**
  * SkPixelStorage is the class representing the storage block for pixel data. It serves as the
  * abstract source of pixel memory—the 2D array of data—that is read from and written to by
  * higher-level Skia objects like SkImage and SkSurface.
  */
-class SkPixelStorage {
+class SkPixelStorage : public SkRefCnt {
 public:
-    SkPixelStorage();
-    virtual ~SkPixelStorage() = default;
-
     enum Type {
         kTextureProxy,
         kPixelRef,
     };
 
+    SkPixelStorage(Type type);
+    ~SkPixelStorage() override = default;
+
     uint32_t getPixelStorageId() const { return fID; }
-    virtual Type type() const = 0;
+    Type type() const { return fType; }
+
+    uint32_t getContentId() const { return fContentID.load(std::memory_order_relaxed); }
+    uint32_t incrementContentId() { return fContentID.fetch_add(1, std::memory_order_relaxed) + 1; }
 
 private:
+    Type fType;
+    /**
+     * fID is a static identifier that differenciates PixelStorages. This is assigned at
+     * construciton and does not change.
+     */
     uint32_t fID;
+    /**
+     * fContentID is an identifier that tracks the current state of a PixelStorage. Gets incremented
+     * and read from other objects that want to track the state of a PixelStorage at a given time.
+     */
+    std::atomic<uint32_t> fContentID = 0;
 
     static uint32_t NextId();
 };

package/cpp/skia/include/private/{base/SkSafe32.h → SkSafe32.h}

@@ -8,8 +8,8 @@
 #ifndef SkSafe32_DEFINED
 #define SkSafe32_DEFINED
 
-#include "include/private/base/SkAssert.h"
-#include "include/private/base/SkMath.h"
+#include "include/private/SkAssert.h"
+#include "include/private/SkMath.h"
 
 #include <cstdint>
 

package/cpp/skia/include/private/{base/SkSemaphore.h → SkSemaphore.h}

@@ -8,9 +8,9 @@
 #ifndef SkSemaphore_DEFINED
 #define SkSemaphore_DEFINED
 
-#include "include/private/base/SkAPI.h"
-#include "include/private/base/SkOnce.h"
-#include "include/private/base/SkThreadAnnotations.h"
+#include "include/private/SkAPI.h"
+#include "include/private/SkOnce.h"
+#include "include/private/SkThreadAnnotations.h"
 
 #include <algorithm>
 #include <atomic>

package/cpp/skia/include/private/{base/SkTArray.h → SkTArray.h}

@@ -8,17 +8,16 @@
 #ifndef SkTArray_DEFINED
 #define SkTArray_DEFINED
 
-#include "include/private/base/SkASAN.h"  // IWYU pragma: keep
-#include "include/private/base/SkAlignedStorage.h"
-#include "include/private/base/SkAssert.h"
-#include "include/private/base/SkAttributes.h"
-#include "include/private/base/SkContainers.h"
-#include "include/private/base/SkDebug.h"
-#include "include/private/base/SkMalloc.h"
-#include "include/private/base/SkMath.h"
-#include "include/private/base/SkSpan_impl.h"
-#include "include/private/base/SkTo.h"
-#include "include/private/base/SkTypeTraits.h"  // IWYU pragma: keep
+#include "include/core/SkSpan.h"
+#include "include/private/SkASAN.h"  // IWYU pragma: keep
+#include "include/private/SkAlignedStorage.h"
+#include "include/private/SkAssert.h"
+#include "include/private/SkAttributes.h"
+#include "include/private/SkContainers.h"
+#include "include/private/SkMalloc.h"
+#include "include/private/SkMath.h"
+#include "include/private/SkTo.h"
+#include "include/private/SkTypeTraits.h"  // IWYU pragma: keep
 
 #include <algorithm>
 #include <climits>