@shopify/react-native-skia 2.6.2 → 2.6.3-next.2

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

@@ -1,5 +1,5 @@
 /*
-* Copyright 2024 Google Inc.
+* Copyright 2024 Google LLC
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.

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

@@ -1,5 +1,5 @@
 /*
-* Copyright 2024 Google Inc.
+* Copyright 2024 Google LLC
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc.
+ * Copyright 2023 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc.
+ * Copyright 2023 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc.
+ * Copyright 2023 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc.
+ * Copyright 2023 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -12,6 +12,8 @@
 #include "include/core/SkData.h"
 #include "include/private/base/SkAPI.h"
 
+#include <algorithm>
+#include <cmath>
 #include <memory>
 #include <optional>
 #include <vector>
@@ -54,6 +56,20 @@ struct SK_API ContentLightLevelInformation {
      */
     sk_sp<SkData> serialize() const;
 
+    /**
+     * Helper functions for accessing members as uint16_t, which is often needed when interacting
+     * with libraries using the CTA semantics.
+     */
+    static ContentLightLevelInformation MakeUint16(uint16_t maxCLL, uint16_t maxFALL) {
+        return { .fMaxCLL = static_cast<float>(maxCLL), .fMaxFALL = static_cast<float>(maxFALL) };
+    }
+    uint16_t getUint16MaxCLL() const {
+        return static_cast<uint16_t>(std::clamp(std::round(fMaxCLL), 0.f, 65535.f));
+    }
+    uint16_t getUint16MaxFALL() const {
+        return static_cast<uint16_t>(std::clamp(std::round(fMaxFALL), 0.f, 65535.f));
+    }
+
     /**
      * Decode from the binary encoding listed at:
      *   Portable Network Graphics (PNG) Specification (Third Edition)
@@ -242,6 +258,11 @@ struct SK_API AdaptiveGlobalToneMap {
      */
     SkString toString() const;
 
+    /**
+     * Return true if this metadata satisfies all normative constraints.
+     */
+    bool isValid() const;
+
     bool operator==(const AdaptiveGlobalToneMap& other) const {
         return fHdrReferenceWhite == other.fHdrReferenceWhite &&
                fHeadroomAdaptiveToneMap == other.fHeadroomAdaptiveToneMap;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc.
+ * Copyright 2023 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPixelStorage_DEFINED
+#define SkPixelStorage_DEFINED
+
+#include <cstdint>
+
+/**
+ * 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 {
+public:
+    SkPixelStorage();
+    virtual ~SkPixelStorage() = default;
+
+    enum Type {
+        kTextureProxy,
+        kPixelRef,
+    };
+
+    uint32_t getPixelStorageId() const { return fID; }
+    virtual Type type() const = 0;
+
+private:
+    uint32_t fID;
+
+    static uint32_t NextId();
+};
+
+#endif

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Google Inc.
+ * Copyright 2023 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -11,6 +11,7 @@
 #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 <cstddef>
 #include <limits>
@@ -69,7 +70,7 @@
 #  endif
 #  define SK_ABORT(message, ...) \
     do { \
-        SkDebugf(SK_DUMP_LINE_FORMAT ": fatal error: \"" message "\"\n", \
+        SKIA_LOG_E(SK_DUMP_LINE_FORMAT ": fatal error: \"" message "\"", \
                  __FILE__, __LINE__, ##__VA_ARGS__); \
         SK_DUMP_GOOGLE3_STACK(); \
         sk_abort_no_print(); \
@@ -137,7 +138,7 @@
 #endif
 
 [[noreturn]] SK_API inline void sk_print_index_out_of_bounds(size_t i, size_t size) {
-    SK_ABORT("Index (%zu) out of bounds for size %zu.\n", i, size);
+    SK_ABORT("Index (%zu) out of bounds for size %zu.", i, size);
 }
 
 template <typename T> SK_API inline T sk_collection_check_bounds(T i, T size) {
@@ -155,7 +156,7 @@ template <typename T> SK_API inline T sk_collection_check_bounds(T i, T size) {
 }
 
 [[noreturn]] SK_API inline void sk_print_length_too_big(size_t i, size_t size) {
-    SK_ABORT("Length (%zu) is too big for size %zu.\n", i, size);
+    SK_ABORT("Length (%zu) is too big for size %zu.", i, size);
 }
 
 template <typename T> SK_API inline T sk_collection_check_length(T i, T size) {
@@ -175,7 +176,7 @@ template <typename T> SK_API inline T sk_collection_check_length(T i, T size) {
 SK_API inline void sk_collection_not_empty(bool empty) {
     if (empty) SK_UNLIKELY {
         #if defined(SK_DEBUG)
-            SK_ABORT("Collection is empty.\n");
+            SK_ABORT("Collection is empty.");
         #else
             SkUNREACHABLE;
         #endif
@@ -183,7 +184,7 @@ SK_API inline void sk_collection_not_empty(bool empty) {
 }
 
 [[noreturn]] SK_API inline void sk_print_size_too_big(size_t size, size_t maxSize) {
-    SK_ABORT("Size (%zu) can't be represented in bytes. Max size is %zu.\n", size, maxSize);
+    SK_ABORT("Size (%zu) can't be represented in bytes. Max size is %zu.", size, maxSize);
 }
 
 template <typename T>

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

@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC.
+// Copyright 2022 Google LLC
 // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 
 #ifndef SkContainers_DEFINED

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

@@ -78,20 +78,20 @@
 #endif
 
 /**
- *  SK_CPU_SSE_LEVEL
+ *  SK_CPU_X64_LEVEL
  *
- *  If defined, SK_CPU_SSE_LEVEL should be set to the highest supported level.
- *  On non-intel CPU this should be undefined.
+ *  If defined, SK_CPU_X64_LEVEL should be set to the highest supported level.
+ *  On non-Intel, non-AMD CPUs this should be undefined.
  */
-#define SK_CPU_SSE_LEVEL_SSE1     10
-#define SK_CPU_SSE_LEVEL_SSE2     20
-#define SK_CPU_SSE_LEVEL_SSE3     30
-#define SK_CPU_SSE_LEVEL_SSSE3    31
-#define SK_CPU_SSE_LEVEL_SSE41    41
-#define SK_CPU_SSE_LEVEL_SSE42    42
-#define SK_CPU_SSE_LEVEL_AVX      51
-#define SK_CPU_SSE_LEVEL_AVX2     52
-#define SK_CPU_SSE_LEVEL_SKX      60
+#define SK_CPU_X64_LEVEL_SSE1     10
+#define SK_CPU_X64_LEVEL_SSE2     20
+#define SK_CPU_X64_LEVEL_SSE3     30
+#define SK_CPU_X64_LEVEL_SSSE3    31
+#define SK_CPU_X64_LEVEL_SSE41    41
+#define SK_CPU_X64_LEVEL_SSE42    42
+#define SK_CPU_X64_LEVEL_AVX      51
+#define SK_CPU_X64_LEVEL_AVX2     52
+#define SK_CPU_X64_LEVEL_ML4      60
 
 /**
  *  SK_CPU_LSX_LEVEL
@@ -99,32 +99,32 @@
  *  If defined, SK_CPU_LSX_LEVEL should be set to the highest supported level.
  *  On non-loongarch CPU this should be undefined.
  */
-#define SK_CPU_LSX_LEVEL_LSX      70
-#define SK_CPU_LSX_LEVEL_LASX     80
+#define SK_CPU_LSX_LEVEL_LSX      10
+#define SK_CPU_LSX_LEVEL_LASX     20
 
 // TODO(kjlubick) clean up these checks
 
 // Are we in GCC/Clang?
-#ifndef SK_CPU_SSE_LEVEL
+#ifndef SK_CPU_X64_LEVEL
     // These checks must be done in descending order to ensure we set the highest
     // available SSE level.
     #if defined(__AVX512F__) && defined(__AVX512DQ__) && defined(__AVX512CD__) && \
         defined(__AVX512BW__) && defined(__AVX512VL__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SKX
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_ML4
     #elif defined(__AVX2__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_AVX2
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_AVX2
     #elif defined(__AVX__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_AVX
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_AVX
     #elif defined(__SSE4_2__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE42
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_SSE42
     #elif defined(__SSE4_1__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE41
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_SSE41
     #elif defined(__SSSE3__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSSE3
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_SSSE3
     #elif defined(__SSE3__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE3
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_SSE3
     #elif defined(__SSE2__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE2
+        #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_SSE2
     #endif
 #endif
 
@@ -137,23 +137,23 @@
 #endif
 
 // Are we in VisualStudio?
-#ifndef SK_CPU_SSE_LEVEL
+#ifndef SK_CPU_X64_LEVEL
     // These checks must be done in descending order to ensure we set the highest
     // available SSE level. 64-bit intel guarantees at least SSE2 support.
     #if defined(__AVX512F__) && defined(__AVX512DQ__) && defined(__AVX512CD__) && \
         defined(__AVX512BW__) && defined(__AVX512VL__)
-        #define SK_CPU_SSE_LEVEL        SK_CPU_SSE_LEVEL_SKX
+        #define SK_CPU_X64_LEVEL        SK_CPU_X64_LEVEL_ML4
     #elif defined(__AVX2__)
-        #define SK_CPU_SSE_LEVEL        SK_CPU_SSE_LEVEL_AVX2
+        #define SK_CPU_X64_LEVEL        SK_CPU_X64_LEVEL_AVX2
     #elif defined(__AVX__)
-        #define SK_CPU_SSE_LEVEL        SK_CPU_SSE_LEVEL_AVX
+        #define SK_CPU_X64_LEVEL        SK_CPU_X64_LEVEL_AVX
     #elif defined(_M_X64) || defined(_M_AMD64)
-        #define SK_CPU_SSE_LEVEL        SK_CPU_SSE_LEVEL_SSE2
+        #define SK_CPU_X64_LEVEL        SK_CPU_X64_LEVEL_SSE2
     #elif defined(_M_IX86_FP)
         #if _M_IX86_FP >= 2
-            #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE2
+            #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_SSE2
         #elif _M_IX86_FP == 1
-            #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE1
+            #define SK_CPU_X64_LEVEL    SK_CPU_X64_LEVEL_SSE1
         #endif
     #endif
 #endif

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

@@ -50,16 +50,10 @@ void SK_SPI SkLog(SkLogPriority priority, const char format[], ...) SK_PRINTF_LI
 #define SKIA_LOG(priority, fmt, ...)                                           \
     do {                                                                       \
         if constexpr (priority <= SKIA_LOWEST_ACTIVE_LOG_PRIORITY) {           \
-            if constexpr (priority == SkLogPriority::kFatal) {                 \
-                SK_ABORT("[skia] " fmt, ##__VA_ARGS__);                        \
-            }                                                                  \
-            else {                                                             \
-                SkLog(priority, "[skia] " fmt "\n", ##__VA_ARGS__);            \
-            }                                                                  \
+            SkLog(priority, "[skia] " fmt "\n", ##__VA_ARGS__);                \
         }                                                                      \
     } while (0)
 
-#define SKIA_LOG_F(fmt, ...) SKIA_LOG(SkLogPriority::kFatal, "** ERROR ** " fmt, ##__VA_ARGS__)
 #define SKIA_LOG_E(fmt, ...) SKIA_LOG(SkLogPriority::kError, "** ERROR ** " fmt, ##__VA_ARGS__)
 #define SKIA_LOG_W(fmt, ...) SKIA_LOG(SkLogPriority::kWarning, "WARNING - " fmt, ##__VA_ARGS__)
 #define SKIA_LOG_I(fmt, ...) SKIA_LOG(SkLogPriority::kInfo, fmt, ##__VA_ARGS__)

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

@@ -25,11 +25,10 @@
  * However, debug logs would be omitted.
  */
 enum class SkLogPriority : int {
-    kFatal = 0,
-    kError = 1,
-    kWarning = 2,
-    kInfo = 3,
-    kDebug = 4,
+    kError = 0,
+    kWarning = 1,
+    kInfo = 2,
+    kDebug = 3,
 };
 
 #endif // SkLogPriority_DEFINED

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -17,6 +17,8 @@
 #include <initializer_list>
 #include <utility>
 
+// We'd prefer not to use these types anymore. SkTDArray can be replaced skia_private::TArray
+
 class SK_SPI SkTDStorage {
 public:
     explicit SkTDStorage(int sizeOfT);
@@ -76,7 +78,17 @@ public:
     }
 
 private:
-    size_t bytes(int n) const { return SkToSizeT(n * fSizeOfT); }
+    // Fast path for pointer arithmetic. Assumes 'n' has already been bounds-checked.
+    size_t bytes(int n) const { return SkToSizeT(n) * SkToSizeT(fSizeOfT); }
+
+    // Safe path for memory allocations; protects against 32-bit overflow.
+    size_t safe_bytes(int n) const {
+        size_t size = SkToSizeT(n);
+        size_t sizeOfT = SkToSizeT(fSizeOfT);
+        SkASSERT_RELEASE(size <= SIZE_MAX / sizeOfT);
+        return size * sizeOfT;
+    }
+
     void* address(int n) { return fStorage + this->bytes(n); }
 
     // Adds delta to fSize. Crash if outside [0, INT_MAX]

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/private/chromium/SkChromeRemoteGlyphCache.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC.
+ * Copyright 2021 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/private/chromium/SkCodecsICCProfileChromium.h

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkCodecsICCProfileChromium_DEFINED
+#define SkCodecsICCProfileChromium_DEFINED
+
+#include <memory>
+
+#include "include/core/SkData.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/base/SkAPI.h"
+#include "modules/skcms/skcms.h"
+
+namespace SkCodecs {
+
+// Allows Chromium code that does not use SkCodec to parse ICC profiles
+// using the same parser that SkCodec uses (skcms or moxcms).
+class SK_API ICCProfileChromium {
+public:
+    virtual ~ICCProfileChromium() = default;
+
+    // Force all ICC profile parsing to use skcms instead of the build-default
+    // parser. This is intended for Chromium to have a kill-switch to fall back
+    // to skcms if moxcms causes issues in the field.
+    //
+    // This is a global setting and is NOT thread-safe with respect to concurrent
+    // codec operations. It should be called once early during process startup.
+    static void ForceSkcms(bool forceSkcms);
+
+    // Returns nullptr if parsing fails. May retain `data`. Uses the parser
+    // selected by ForceSkcms (defaults to the build-default parser).
+    static std::unique_ptr<ICCProfileChromium> Make(sk_sp<SkData> data);
+
+    // Return the parsed profile. The pointers in the structure are guaranteed
+    // to be valid until `this` is destroyed.
+    virtual const skcms_ICCProfile& GetProfile() const = 0;
+
+protected:
+    ICCProfileChromium() = default;
+
+private:
+    ICCProfileChromium(const ICCProfileChromium&) = delete;
+    ICCProfileChromium& operator=(const ICCProfileChromium&) = delete;
+};
+
+}  // namespace SkCodecs
+
+#endif  // SkCodecsICCProfileChromium_DEFINED

package/cpp/skia/include/private/chromium/SkExifChromium.h

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkExifChromium_DEFINED
+#define SkExifChromium_DEFINED
+
+#include "include/private/base/SkAPI.h"
+
+namespace SkExif {
+
+// Force all EXIF parsing to use the C++ SkExif parser instead of the
+// build-default parser. This is intended for Chromium to have a kill-switch
+// to fall back to the C++ implementation if rust_exif causes issues in the
+// field.
+//
+// This is a global setting and is NOT thread-safe with respect to concurrent
+// codec operations. It should be called once early during process startup.
+SK_API void ForceSkExif(bool forceSkExif);
+
+}  // namespace SkExif
+
+#endif  // SkExifChromium_DEFINED

package/cpp/skia/include/private/gpu/ganesh/GrContext_Base.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/private/gpu/ganesh/GrImageContext.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/private/gpu/ganesh/GrTypesPriv.h

@@ -621,7 +621,7 @@ static constexpr SkColorType GrColorTypeToSkColorType(GrColorType ct) {
         case GrColorType::kRGB_888:          return kUnknown_SkColorType;
         case GrColorType::kR_8:              return kR8_unorm_SkColorType;
         case GrColorType::kR_16:             return kR16_unorm_SkColorType;
-        case GrColorType::kR_F16:            return kUnknown_SkColorType;
+        case GrColorType::kR_F16:            return kR16_float_SkColorType;
         case GrColorType::kGray_F16:         return kUnknown_SkColorType;
         case GrColorType::kARGB_4444:        return kUnknown_SkColorType;
         case GrColorType::kBGRA_4444:        return kUnknown_SkColorType;
@@ -656,6 +656,7 @@ static constexpr GrColorType SkColorTypeToGrColorType(SkColorType ct) {
         case kR16_unorm_SkColorType:          return GrColorType::kR_16;
         case kR16G16_unorm_SkColorType:       return GrColorType::kRG_1616;
         case kA16_float_SkColorType:          return GrColorType::kAlpha_F16;
+        case kR16_float_SkColorType:          return GrColorType::kR_F16;
         case kR16G16_float_SkColorType:       return GrColorType::kRG_F16;
         case kR16G16B16A16_unorm_SkColorType: return GrColorType::kRGBA_16161616;
         case kR8_unorm_SkColorType:           return GrColorType::kR_8;

package/cpp/skia/include/private/gpu/vk/SkiaVulkan.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2018 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.

package/cpp/skia/include/sksl/SkSLDebugTrace.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Google LLC.
+ * Copyright 2021 Google LLC
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.