@shopify/react-native-skia 1.0.2 → 1.0.3

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

@@ -136,6 +136,8 @@ public:
         /**
          *  If the container format contains both still images and image sequences,
          *  SkCodec should choose one of the still images. This is the default.
+         *  Note that kPreferStillImage may prevent use of the animation features
+         *  if the input is not rewindable.
          */
         kPreferStillImage,
         /**
@@ -409,7 +411,8 @@ public:
     }
 
     /**
-     *  Return an image containing the pixels.
+     *  Return an image containing the pixels. If the codec's origin is not "upper left",
+     *  This will rotate the output image accordingly.
      */
     std::tuple<sk_sp<SkImage>, SkCodec::Result> getImage(const SkImageInfo& info,
                                                          const Options* opts = nullptr);

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

@@ -62,7 +62,7 @@ namespace SkSL { struct Program; }
  * assumed to be shared between stages. It is an error to specify uniforms in the vertex and
  * fragment program with the same name but different types, dimensionality, or layouts.
  */
-class SkMeshSpecification : public SkNVRefCnt<SkMeshSpecification> {
+class SK_API SkMeshSpecification : public SkNVRefCnt<SkMeshSpecification> {
 public:
     /** These values are enforced when creating a specification. */
     static constexpr size_t kMaxStride       = 1024;
@@ -260,7 +260,7 @@ private:
  * SkMeshSpecification::uniformSize() and SkMeshSpecification::uniforms() for sizing and packing
  * uniforms into the SkData.
  */
-class SkMesh {
+class SK_API SkMesh {
 public:
     class IndexBuffer : public SkRefCnt {
     public:

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

@@ -5,5 +5,5 @@
  * found in the LICENSE file.
  */
 #ifndef SK_MILESTONE
-#define SK_MILESTONE 122
+#define SK_MILESTONE 123
 #endif

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

@@ -9,13 +9,20 @@
 #define SkPathEffect_DEFINED
 
 #include "include/core/SkFlattenable.h"
+#include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
-// not needed, but some of our clients need it (they don't IWYU)
-#include "include/core/SkPath.h"
+#include "include/private/base/SkAPI.h"
 
-class SkPath;
-struct SkRect;
+// TODO(kjlubick) update clients and remove this unnecessary #include
+#include "include/core/SkPath.h"  // IWYU pragma: keep
+
+#include <cstddef>
+#include <cstdint>
+
+class SkMatrix;
 class SkStrokeRec;
+struct SkDeserialProcs;
+struct SkRect;
 
 /** \class SkPathEffect
 

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

@@ -9,8 +9,13 @@
 #define SkPathMeasure_DEFINED
 
 #include "include/core/SkContourMeasure.h"
-#include "include/core/SkPath.h"
-#include "include/private/base/SkTDArray.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/private/base/SkAPI.h"
+
+class SkMatrix;
+class SkPath;
 
 class SK_API SkPathMeasure {
 public:

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

@@ -8,8 +8,9 @@
 #ifndef SkPoint3_DEFINED
 #define SkPoint3_DEFINED
 
-#include "include/core/SkPoint.h"
 #include "include/core/SkScalar.h"
+#include "include/private/base/SkAPI.h"
+#include "include/private/base/SkAssert.h"
 
 struct SK_API SkPoint3 {
     SkScalar fX, fY, fZ;

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

@@ -9,7 +9,9 @@
 #define SkRSXform_DEFINED
 
 #include "include/core/SkPoint.h"
+#include "include/core/SkScalar.h"
 #include "include/core/SkSize.h"
+#include "include/private/base/SkAPI.h"
 
 /**
  *  A compressed form of a rotation+scale matrix.

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

@@ -82,14 +82,14 @@ static inline bool SkStrContains(const char string[], const char subchar) {
  */
 
 static constexpr int kSkStrAppendU32_MaxSize = 10;
-char*   SkStrAppendU32(char buffer[], uint32_t);
+char* SkStrAppendU32(char buffer[], uint32_t);
 static constexpr int kSkStrAppendU64_MaxSize = 20;
-char*   SkStrAppendU64(char buffer[], uint64_t, int minDigits);
+char* SkStrAppendU64(char buffer[], uint64_t, int minDigits);
 
 static constexpr int kSkStrAppendS32_MaxSize = kSkStrAppendU32_MaxSize + 1;
-char*   SkStrAppendS32(char buffer[], int32_t);
+char* SkStrAppendS32(char buffer[], int32_t);
 static constexpr int kSkStrAppendS64_MaxSize = kSkStrAppendU64_MaxSize + 1;
-char*   SkStrAppendS64(char buffer[], int64_t, int minDigits);
+char* SkStrAppendS64(char buffer[], int64_t, int minDigits);
 
 /**
  *  Floats have at most 8 significant digits, so we limit our %g to that.
@@ -281,7 +281,7 @@ private:
 };
 
 /// Creates a new string and writes into it using a printf()-style format.
-SkString SkStringPrintf(const char* format, ...) SK_PRINTF_LIKE(1, 2);
+SK_API SkString SkStringPrintf(const char* format, ...) SK_PRINTF_LIKE(1, 2);
 /// This makes it easier to write a caller as a VAR_ARGS function where the format string is
 /// optional.
 static inline SkString SkStringPrintf() { return SkString(); }

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

@@ -8,6 +8,7 @@
 #ifndef SkSurfaceProps_DEFINED
 #define SkSurfaceProps_DEFINED
 
+#include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
 #include "include/private/base/SkTo.h"
 
@@ -52,27 +53,33 @@ static inline bool SkPixelGeometryIsV(SkPixelGeometry geo) {
 class SK_API SkSurfaceProps {
 public:
     enum Flags {
+        kDefault_Flag = 0,
         kUseDeviceIndependentFonts_Flag = 1 << 0,
         // Use internal MSAA to render to non-MSAA GPU surfaces.
-        kDynamicMSAA_Flag               = 1 << 1,
+        kDynamicMSAA_Flag = 1 << 1,
         // If set, all rendering will have dithering enabled
         // Currently this only impacts GPU backends
-        kAlwaysDither_Flag              = 1 << 2,
+        kAlwaysDither_Flag = 1 << 2,
     };
 
-    /** No flags, unknown pixel geometry. */
+    /** No flags, unknown pixel geometry, platform-default contrast/gamma. */
     SkSurfaceProps();
+    /** TODO(kschmi): Remove this constructor and replace with the one below. **/
     SkSurfaceProps(uint32_t flags, SkPixelGeometry);
+    /** Specified pixel geometry, text contrast, and gamma **/
+    SkSurfaceProps(uint32_t flags, SkPixelGeometry, SkScalar textContrast, SkScalar textGamma);
 
     SkSurfaceProps(const SkSurfaceProps&) = default;
     SkSurfaceProps& operator=(const SkSurfaceProps&) = default;
 
     SkSurfaceProps cloneWithPixelGeometry(SkPixelGeometry newPixelGeometry) const {
-        return SkSurfaceProps(fFlags, newPixelGeometry);
+        return SkSurfaceProps(fFlags, newPixelGeometry, fTextContrast, fTextGamma);
     }
 
     uint32_t flags() const { return fFlags; }
     SkPixelGeometry pixelGeometry() const { return fPixelGeometry; }
+    SkScalar textContrast() const { return fTextContrast; }
+    SkScalar textGamma() const { return fTextGamma; }
 
     bool isUseDeviceIndependentFonts() const {
         return SkToBool(fFlags & kUseDeviceIndependentFonts_Flag);
@@ -83,7 +90,8 @@ public:
     }
 
     bool operator==(const SkSurfaceProps& that) const {
-        return fFlags == that.fFlags && fPixelGeometry == that.fPixelGeometry;
+        return fFlags == that.fFlags && fPixelGeometry == that.fPixelGeometry &&
+        fTextContrast == that.fTextContrast && fTextGamma == that.fTextGamma;
     }
 
     bool operator!=(const SkSurfaceProps& that) const {
@@ -93,6 +101,11 @@ public:
 private:
     uint32_t        fFlags;
     SkPixelGeometry fPixelGeometry;
+
+    // This gamma value is specifically about blending of mask coverage.
+    // The surface also has a color space, but that applies to the colors.
+    SkScalar fTextContrast;
+    SkScalar fTextGamma;
 };
 
 #endif

package/cpp/skia/include/gpu/GrBackendDrawableInfo.h

@@ -5,40 +5,5 @@
  * found in the LICENSE file.
  */
 
-#ifndef GrBackendDrawableInfo_DEFINED
-#define GrBackendDrawableInfo_DEFINED
-
-#include "include/gpu/GrTypes.h"
-
-#include "include/gpu/vk/GrVkTypes.h"
-
-class SK_API GrBackendDrawableInfo {
-public:
-    // Creates an invalid backend drawable info.
-    GrBackendDrawableInfo() : fIsValid(false) {}
-
-    GrBackendDrawableInfo(const GrVkDrawableInfo& info)
-            : fIsValid(true)
-            , fBackend(GrBackendApi::kVulkan)
-            , fVkInfo(info) {}
-
-    // Returns true if the backend texture has been initialized.
-    bool isValid() const { return fIsValid; }
-
-    GrBackendApi backend() const { return fBackend; }
-
-    bool getVkDrawableInfo(GrVkDrawableInfo* outInfo) const {
-        if (this->isValid() && GrBackendApi::kVulkan == fBackend) {
-            *outInfo = fVkInfo;
-            return true;
-        }
-        return false;
-    }
-
-private:
-    bool             fIsValid;
-    GrBackendApi     fBackend;
-    GrVkDrawableInfo fVkInfo;
-};
-
-#endif
+// TODO(kjlubick) delete after Chrome (and Android?) are migrated.
+#include "include/gpu/ganesh/vk/GrBackendDrawableInfo.h"

package/cpp/skia/include/gpu/GrDriverBugWorkaroundsAutogen.h

@@ -5,6 +5,7 @@
 // This file is auto-generated from build_workaround_header.py
 // DO NOT EDIT!
 
+#ifndef GPU_DRIVER_BUG_WORKAROUNDS
 #define GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP)              \
   GPU_OP(ADD_AND_TRUE_TO_LOOP_CONDITION,                \
          add_and_true_to_loop_condition)                \
@@ -40,4 +41,5 @@
          unbind_attachments_on_bound_render_fbo_delete) \
   GPU_OP(UNFOLD_SHORT_CIRCUIT_AS_TERNARY_OPERATION,     \
          unfold_short_circuit_as_ternary_operation)     \
-// The End
+
+#endif  // GPU_DRIVER_BUG_WORKAROUNDS

package/cpp/skia/include/gpu/MutableTextureState.h

@@ -12,12 +12,6 @@
 #include "include/core/SkTypes.h"
 #include "include/private/base/SkAnySubclass.h"
 
-#if defined(SK_VULKAN) && !defined(SK_DISABLE_LEGACY_VULKAN_MUTABLE_TEXTURE_STATE)
-#include "include/private/gpu/vk/SkiaVulkan.h"
-
-#include <cstdint>
-#endif
-
 #include <cstddef>
 
 namespace skgpu {
@@ -49,13 +43,6 @@ public:
     // Returns true if the backend mutable state has been initialized.
     bool isValid() const { return fIsValid; }
 
-#if defined(SK_VULKAN) && !defined(SK_DISABLE_LEGACY_VULKAN_MUTABLE_TEXTURE_STATE)
-    MutableTextureState(VkImageLayout layout, uint32_t queueFamilyIndex);
-
-    VkImageLayout getVkImageLayout() const;
-    uint32_t getQueueFamilyIndex() const;
-#endif
-
 private:
     friend class MutableTextureStateData;
     friend class MutableTextureStatePriv;

package/cpp/skia/include/gpu/ganesh/vk/GrBackendDrawableInfo.h

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2018 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrBackendDrawableInfo_DEFINED
+#define GrBackendDrawableInfo_DEFINED
+
+#include "include/gpu/GrTypes.h"
+
+#include "include/gpu/vk/GrVkTypes.h"
+
+// If necessary, this could be pulled into a generic interface, but at this point, we only expect
+// it to be used by the Ganesh Vulkan backend.
+class SK_API GrBackendDrawableInfo {
+public:
+    // Creates an invalid backend drawable info.
+    GrBackendDrawableInfo() : fIsValid(false) {}
+
+    GrBackendDrawableInfo(const GrVkDrawableInfo& info)
+            : fIsValid(true)
+            , fBackend(GrBackendApi::kVulkan)
+            , fVkInfo(info) {}
+
+    // Returns true if the backend texture has been initialized.
+    bool isValid() const { return fIsValid; }
+
+    GrBackendApi backend() const { return fBackend; }
+
+    bool getVkDrawableInfo(GrVkDrawableInfo* outInfo) const {
+        if (this->isValid() && GrBackendApi::kVulkan == fBackend) {
+            *outInfo = fVkInfo;
+            return true;
+        }
+        return false;
+    }
+
+private:
+    bool             fIsValid;
+    GrBackendApi     fBackend;
+    GrVkDrawableInfo fVkInfo;
+};
+
+#endif

package/cpp/skia/include/gpu/gl/GrGLAssembleHelpers.h

@@ -4,8 +4,12 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#ifndef GrGLAssembleHelpers_DEFINED
+#define GrGLAssembleHelpers_DEFINED
 
 #include "include/gpu/gl/GrGLAssembleInterface.h"
 
 void GrGetEGLQueryAndDisplay(GrEGLQueryStringFn** queryString, GrEGLDisplay* display,
                              void* ctx, GrGLGetProc get);
+
+#endif  // GrGLAssembleHelpers_DEFINED

package/cpp/skia/include/gpu/gl/GrGLAssembleInterface.h

@@ -4,8 +4,11 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#ifndef GrGLAssembleInterface_DEFINED
+#define GrGLAssembleInterface_DEFINED
 
 #include "include/gpu/gl/GrGLInterface.h"
+#include "include/private/base/SkAPI.h"
 
 typedef GrGLFuncPtr (*GrGLGetProc)(void* ctx, const char name[]);
 
@@ -37,3 +40,5 @@ SK_API sk_sp<const GrGLInterface> GrGLMakeAssembledWebGLInterface(void *ctx, GrG
 
 /** Deprecated version of GrGLMakeAssembledInterface() that returns a bare pointer. */
 SK_API const GrGLInterface* GrGLAssembleInterface(void *ctx, GrGLGetProc get);
+
+#endif  // GrGLAssembleInterface_DEFINED

package/cpp/skia/include/gpu/gl/GrGLInterface.h

@@ -78,11 +78,7 @@ public:
 #endif
 
     // Indicates the type of GL implementation
-    union {
-        GrGLStandard fStandard;
-        GrGLStandard fBindingsExported; // Legacy name, will be remove when Chromium is updated.
-    };
-
+    GrGLStandard fStandard;
     GrGLExtensions fExtensions;
 
     bool hasExtension(const char ext[]) const { return fExtensions.has(ext); }

package/cpp/skia/include/gpu/gl/egl/GrGLMakeEGLInterface.h

@@ -4,11 +4,20 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-
-#include "include/gpu/GrTypes.h"
+#ifndef GrGLMakeEGLInterface_DEFINED
+#define GrGLMakeEGLInterface_DEFINED
 
 #include "include/core/SkRefCnt.h"
+#include "include/gpu/GrTypes.h"
 
 struct GrGLInterface;
 
+namespace GrGLInterfaces {
+SK_API sk_sp<const GrGLInterface> MakeEGL();
+}
+
+#if !defined(SK_DISABLE_LEGACY_GLXINTERFACE_FACTORY)
 sk_sp<const GrGLInterface> GrGLMakeEGLInterface();
+#endif
+
+#endif  // GrGLMakeEGLInterface_DEFINED

package/cpp/skia/include/gpu/gl/glx/GrGLMakeGLXInterface.h

@@ -4,17 +4,20 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-
-#include "include/gpu/GrTypes.h"
+#ifndef GrGLMakeGLXInterface_DEFINED
+#define GrGLMakeGLXInterface_DEFINED
 
 #include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
 
 struct GrGLInterface;
 
 namespace GrGLInterfaces {
-sk_sp<const GrGLInterface> MakeGLX();
+SK_API sk_sp<const GrGLInterface> MakeGLX();
 }
 
 #if !defined(SK_DISABLE_LEGACY_GLXINTERFACE_FACTORY)
 sk_sp<const GrGLInterface> GrGLMakeGLXInterface();
 #endif
+
+#endif  // GrGLMakeGLXInterface_DEFINED

package/cpp/skia/include/gpu/graphite/Context.h

@@ -157,6 +157,12 @@ public:
      */
     void dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) const;
 
+    /**
+     * Returns true if the backend-specific context has gotten into an unrecoverarble, lost state
+     * (e.g. if we've gotten a VK_ERROR_DEVICE_LOST in the Vulkan backend).
+     */
+    bool isDeviceLost() const;
+
     /*
      * Does this context support protected content?
      */

package/cpp/skia/include/gpu/graphite/dawn/DawnBackendContext.h

@@ -15,7 +15,8 @@ namespace skgpu::graphite {
 
 /**
  * WebGPU needs to allow the main thread loop to run to detect GPU progress. Dawn native has a
- * function wgpu::Dawn::Tick(), not present in WebGPU, that can be used to detect GPU progress.
+ * function wgpu::Instance::ProcessEvents, not (currently) present in WebGPU, that can be used to
+ * detect GPU progress.
  *
  * When compiling using Emscripten/WASM the -s ASYNCIFY option can be used to yield. E.g.:
  *
@@ -38,16 +39,19 @@ namespace skgpu::graphite {
  * Using a non-yielding Context makes it possible to build and run Graphite/Dawn on WebGPU without
  * -s ASYNCIFY.
  */
-using DawnTickFunction = void(const wgpu::Device& device);
+using DawnTickFunction = void(const wgpu::Instance& device);
 
 #if !defined(__EMSCRIPTEN__)
-SK_API inline void DawnNativeTickFunction(const wgpu::Device& device) { device.Tick(); }
+SK_API inline void DawnNativeProcessEventsFunction(const wgpu::Instance& instance) {
+    instance.ProcessEvents();
+}
 #endif
 
 // The DawnBackendContext contains all of the base Dawn objects needed by the graphite Dawn
 // backend. The client will create this object and pass it into the Context::MakeDawn factory call
 // when setting up Skia.
 struct SK_API DawnBackendContext {
+    wgpu::Instance fInstance;
     wgpu::Device fDevice;
     wgpu::Queue fQueue;
     // See comment on DawnTickFunction.
@@ -55,7 +59,7 @@ struct SK_API DawnBackendContext {
 #if defined(__EMSCRIPTEN__)
             nullptr;
 #else
-            DawnNativeTickFunction;
+            DawnNativeProcessEventsFunction;
 #endif
 };
 

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

@@ -73,6 +73,12 @@ struct SK_API GrVkBackendContext {
     // Indicates that we are working with protected content and all CommandPool and Queue operations
     // should be done in a protected context.
     skgpu::Protected                    fProtectedContext = skgpu::Protected::kNo;
+    // Optional callback which will be invoked if a VK_ERROR_DEVICE_LOST error code is received from
+    // the driver. Debug information from the driver will be provided to the callback if the
+    // VK_EXT_device_fault extension is supported and enabled (VkPhysicalDeviceFaultFeaturesEXT must
+    // be in the pNext chain of VkDeviceCreateInfo).
+    skgpu::VulkanDeviceLostContext      fDeviceLostContext = nullptr;
+    skgpu::VulkanDeviceLostProc         fDeviceLostProc = nullptr;
 };
 
 #endif

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

@@ -39,6 +39,12 @@ struct SK_API VulkanBackendContext {
     sk_sp<VulkanMemoryAllocator>     fMemoryAllocator;
     skgpu::VulkanGetProc             fGetProc;
     Protected                        fProtectedContext;
+    // Optional callback which will be invoked if a VK_ERROR_DEVICE_LOST error code is received from
+    // the driver. Debug information from the driver will be provided to the callback if the
+    // VK_EXT_device_fault extension is supported and enabled (VkPhysicalDeviceFaultFeaturesEXT must
+    // be in the pNext chain of VkDeviceCreateInfo).
+    skgpu::VulkanDeviceLostContext   fDeviceLostContext = nullptr;
+    skgpu::VulkanDeviceLostProc      fDeviceLostProc = nullptr;
 };
 
 } // namespace skgpu::graphite

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

@@ -9,17 +9,18 @@
 #define skgpu_VulkanMutableTextureState_DEFINED
 
 #include "include/gpu/MutableTextureState.h"
+#include "include/private/base/SkAPI.h"
 #include "include/private/gpu/vk/SkiaVulkan.h"
 
 #include <cstdint>
 
 namespace skgpu::MutableTextureStates {
-    MutableTextureState MakeVulkan(VkImageLayout layout, uint32_t queueFamilyIndex);
+SK_API MutableTextureState MakeVulkan(VkImageLayout layout, uint32_t queueFamilyIndex);
 
-    VkImageLayout GetVkImageLayout(const MutableTextureState& state);
-    VkImageLayout GetVkImageLayout(const MutableTextureState* state);
-    uint32_t GetVkQueueFamilyIndex(const MutableTextureState& state);
-    uint32_t GetVkQueueFamilyIndex(const MutableTextureState* state);
+SK_API VkImageLayout GetVkImageLayout(const MutableTextureState& state);
+SK_API VkImageLayout GetVkImageLayout(const MutableTextureState* state);
+SK_API uint32_t GetVkQueueFamilyIndex(const MutableTextureState& state);
+SK_API uint32_t GetVkQueueFamilyIndex(const MutableTextureState* state);
 }
 
 #endif

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

@@ -11,7 +11,10 @@
 #include "include/core/SkTypes.h"
 #include "include/private/gpu/vk/SkiaVulkan.h"
 
+#include <cstddef>
 #include <functional>
+#include <string>
+#include <vector>
 
 #ifndef VK_VERSION_1_1
 #error Skia requires the use of Vulkan 1.1 headers
@@ -98,6 +101,13 @@ struct VulkanYcbcrConversionInfo {
     VkFormatFeatureFlags fFormatFeatures = 0;
 };
 
+typedef void* VulkanDeviceLostContext;
+typedef void (*VulkanDeviceLostProc)(VulkanDeviceLostContext faultContext,
+                                     const std::string& description,
+                                     const std::vector<VkDeviceFaultAddressInfoEXT>& addressInfos,
+                                     const std::vector<VkDeviceFaultVendorInfoEXT>& vendorInfos,
+                                     const std::vector<std::byte>& vendorBinaryData);
+
 } // namespace skgpu
 
 #endif // skgpu_VulkanTypes_DEFINED

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

@@ -4,12 +4,17 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#ifndef SkImageGeneratorCG_DEFINED
+#define SkImageGeneratorCG_DEFINED
+
+#include "include/private/base/SkFeatures.h"
 
-#include "include/core/SkTypes.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 <memory>
 
@@ -17,4 +22,5 @@ namespace SkImageGeneratorCG {
 SK_API std::unique_ptr<SkImageGenerator> MakeFromEncodedCG(sk_sp<SkData>);
 }  // namespace SkImageGeneratorCG
 
-#endif //defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+#endif  // defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
+#endif  // SkImageGeneratorCG_DEFINED

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

@@ -5,12 +5,17 @@
  * found in the LICENSE file.
  */
 
-#include "include/core/SkTypes.h"
+#ifndef SkImageGeneratorWIC_DEFINED
+#define SkImageGeneratorWIC_DEFINED
+
+#include "include/private/base/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 <memory>
 
@@ -32,4 +37,5 @@ namespace SkImageGeneratorWIC {
 SK_API std::unique_ptr<SkImageGenerator> MakeFromEncodedWIC(sk_sp<SkData>);
 }
 
-#endif // SK_BUILD_FOR_WIN
+#endif  // SK_BUILD_FOR_WIN
+#endif  // SkImageGeneratorWIC_DEFINED

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

@@ -382,5 +382,4 @@ constexpr SkPMColor4f SK_PMColor4fILLEGAL = { SK_FloatNegativeInfinity,
                                               SK_FloatNegativeInfinity,
                                               SK_FloatNegativeInfinity,
                                               SK_FloatNegativeInfinity };
-
-#endif
+#endif  // SkColorData_DEFINED

package/cpp/skia/include/private/base/SkFloatingPoint.h

@@ -161,6 +161,11 @@ inline constexpr int SK_FLT_DECIMAL_DIG = std::numeric_limits<float>::max_digits
 
 // IEEE defines how float divide behaves for non-finite values and zero-denoms, but C does not,
 // so we have a helper that suppresses the possible undefined-behavior warnings.
+#ifdef SK_BUILD_FOR_WIN
+#pragma warning( push )
+#pragma warning( disable : 4723)
+#endif
+// Your function
 SK_NO_SANITIZE("float-divide-by-zero")
 static constexpr float sk_ieee_float_divide(float numer, float denom) {
     return numer / denom;
@@ -170,6 +175,9 @@ SK_NO_SANITIZE("float-divide-by-zero")
 static constexpr double sk_ieee_double_divide(double numer, double denom) {
     return numer / denom;
 }
+#ifdef SK_BUILD_FOR_WIN
+#pragma warning( pop )
+#endif
 
 // Return a*b + c.
 static inline float sk_fmaf(float a, float b, float c) {