@shopify/react-native-skia 2.6.5 → 2.6.7

package/cpp/skia/include/android/GrAHardwareBufferUtils.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/android/SkAndroidFrameworkUtils.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/android/SkAnimatedImage.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/codec/SkCodec.h

@@ -834,14 +834,6 @@ public:
     };
     IsAnimated isAnimated() { return this->onIsAnimated(); }
 
-    // Register a decoder at runtime by passing two function pointers:
-    //    - peek() to return true if the span of bytes appears to be your encoded format;
-    //    - make() to attempt to create an SkCodec from the given stream.
-    // Not thread safe.
-    static void Register(
-            bool                     (*peek)(const void*, size_t),
-            std::unique_ptr<SkCodec> (*make)(std::unique_ptr<SkStream>, SkCodec::Result*));
-
 protected:
     const SkEncodedInfo& getEncodedInfo() const { return fEncodedInfo; }
 

package/cpp/skia/include/codec/SkEncodedOrigin.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/codec/SkPngRustDecoder.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Google LLC.
+ * 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/core/SkBitmap.h

@@ -27,7 +27,6 @@
 class SkColorSpace;
 class SkImage;
 class SkMatrix;
-class SkMipmap;
 class SkPaint;
 class SkPixelRef;
 class SkShader;
@@ -1241,13 +1240,8 @@ public:
     };
 
 private:
-    sk_sp<SkPixelRef>   fPixelRef;
-    SkPixmap            fPixmap;
-    sk_sp<SkMipmap>     fMips;
-
-    friend class SkImage_Raster;
-    friend class SkReadBuffer;        // unflatten
-    friend class GrProxyProvider;     // fMips
+    sk_sp<SkPixelRef> fPixelRef;
+    SkPixmap fPixmap;
 };
 
 ///////////////////////////////////////////////////////////////////////////////

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

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

package/cpp/skia/include/core/SkCanvasVirtualEnforcer.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/core/SkColorType.h

@@ -103,15 +103,17 @@ enum SkColorType : int {
     // Four channel RGBA data (32-bit float per channel) packed into a LE 128-bit word.
     //   Bits: [A:127..96 B:95..64 G:63..32 R:31..0]
     kRGBA_F32_SkColorType,
-
-    // The following 8 colortypes are just for reading from - not for rendering to
-
     // Two channel RG data (8 bits per channel). Blue is forced to 0, alpha is forced to opaque.
     //   Bits: [G:15..8 R:7..0]
     kR8G8_unorm_SkColorType,
     // Single channel data (16-bit half-float) interpreted as alpha. RGB are 0.
     //   Bits: [A:15..0]
     kA16_float_SkColorType,
+
+    // Single channel data (16 bits half-float) interpreted as red. G and B are forced to 0, alpha
+    // is forced to opaque.
+    //   Bits: [R:15..0]
+    kR16_float_SkColorType,
     // Two channel RG data (16-bit half-float per channel) packed into a LE 32-bit word.
     // Blue is forced to 0, alpha is forced to opaque.
     //   Bits: [G:31..16 R:15..0]

package/cpp/skia/include/core/SkContourMeasure.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/core/SkCoverageMode.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/core/SkCubicMap.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/core/SkExecutor.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/core/SkFont.h

@@ -26,6 +26,7 @@
 
 class SkMatrix;
 class SkPaint;
+class SkStrikeRef;
 enum class SkFontHinting;
 enum class SkTextEncoding;
 struct SkFontMetrics;
@@ -356,6 +357,20 @@ public:
     SkScalar measureText(const void* text, size_t byteLength, SkTextEncoding encoding,
                          SkRect* bounds, const SkPaint* paint) const;
 
+    /** Returns an SkStrikeRef for this font's current settings.
+
+        An SkStrikeRef caches the resolved strike (font metrics engine), avoiding the overhead
+        of descriptor construction, hashing, and global cache lookup on each glyph query.
+        This is useful when making many glyph metric calls (e.g. getWidths) with the same
+        font configuration.
+
+        The returned SkStrikeRef is independent of this SkFont; subsequent changes to this
+        SkFont do not affect it. Create a new SkStrikeRef after changing font properties.
+
+        @return  an SkStrikeRef for the current font settings
+    */
+    SkStrikeRef makeStrikeRef() const;
+
     /** Retrieves the advance and bounds for each glyph in glyphs.
         widths receives min(widths.size(), glyphs.size()) values.
         bounds receives min(bounds.size(), glyphs.size()) values.

package/cpp/skia/include/core/SkFontArguments.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.
@@ -19,6 +19,11 @@
 struct SkFontArguments {
     struct VariationPosition {
         struct Coordinate {
+            static constexpr SkFourByteTag wght = SkSetFourByteTag('w', 'g', 'h', 't');
+            static constexpr SkFourByteTag wdth = SkSetFourByteTag('w', 'd', 't', 'h');
+            static constexpr SkFourByteTag slnt = SkSetFourByteTag('s', 'l', 'n', 't');
+            static constexpr SkFourByteTag ital = SkSetFourByteTag('i', 't', 'a', 'l');
+            static constexpr SkFourByteTag opsz = SkSetFourByteTag('o', 'p', 's', 'z');
             SkFourByteTag axis;
             float value;
         };

package/cpp/skia/include/core/SkFontMetrics.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/core/SkFontMgr.h

@@ -8,7 +8,9 @@
 #ifndef SkFontMgr_DEFINED
 #define SkFontMgr_DEFINED
 
+#include "include/core/SkFontArguments.h"
 #include "include/core/SkRefCnt.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkTypes.h"
 
 #include <memory>
@@ -18,7 +20,6 @@ class SkFontStyle;
 class SkStreamAsset;
 class SkString;
 class SkTypeface;
-struct SkFontArguments;
 
 class SK_API SkFontStyleSet : public SkRefCnt {
 public:
@@ -85,6 +86,38 @@ public:
                                                 const char* bcp47[], int bcp47Count,
                                                 SkUnichar character) const;
 
+    struct Request {
+        struct CMapEntry {
+            SkUnichar character;
+            SkUnichar variation;  // Zero for default variation.
+        };
+        SkSpan<const CMapEntry> cmapEntries;
+
+        /**
+         *  bcp47[0] is the least significant fallback, bcp47[bcp47Count-1] is the most significant.
+         *  If no specified bcp47 codes match any font with the requested character will be matched.
+         */
+        SkSpan<const char*> bcp47;
+
+        const char* familyName;
+
+        SkSpan<const SkFontArguments::VariationPosition::Coordinate> model;
+        SkFontStyle fontStyleFromModel() const;
+        static void SetModel(SkFontStyle s, SkFontArguments::VariationPosition::Coordinate(&m)[4]);
+
+        std::optional<bool> syntheticBold;
+        std::optional<bool> syntheticOblique;
+    };
+
+    /** The familyName must strongly match, everything else is tie breakers. */
+    sk_sp<SkTypeface> match(const Request&) const;
+
+    /**
+     * The first cmapEntry must match. Then matched by bcp47, then familyName,
+     * then model (italic, slant, width, weight), with synthetics allowed or not.
+     */
+    sk_sp<SkTypeface> fallback(const Request&) const;
+
     /**
      *  Create a typeface for the specified data and TTC index (pass 0 for none)
      *  or NULL if the data is not recognized. The caller must call unref() on
@@ -129,6 +162,8 @@ protected:
                                                           const SkFontStyle&,
                                                           const char* bcp47[], int bcp47Count,
                                                           SkUnichar character) const = 0;
+    virtual sk_sp<SkTypeface> onMatch(const Request&) const; // TODO: pure virtual
+    virtual sk_sp<SkTypeface> onFallback(const Request&) const; // TODO: pure virtual
 
     virtual sk_sp<SkTypeface> onMakeFromData(sk_sp<SkData>, int ttcIndex) const = 0;
     virtual sk_sp<SkTypeface> onMakeFromStreamIndex(std::unique_ptr<SkStreamAsset>,

package/cpp/skia/include/core/SkFontParameters.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/core/SkFontScanner.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/core/SkFontTypes.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/core/SkM44.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/core/SkMilestone.h

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google Inc.
+ * Copyright 2022 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/core/SkPathBuilder.h

@@ -36,9 +36,9 @@ class SkString;
 #endif
 
 class SK_API SkPathBuilder {
-    using PointsArray = skia_private::STArray<4, SkPoint>;
-    using VerbsArray = skia_private::STArray<4, SkPathVerb>;
-    using ConicWeightsArray = skia_private::STArray<2, float>;
+    using PointsArray       = skia_private::STArray<32, SkPoint>;
+    using VerbsArray        = skia_private::STArray<32, SkPathVerb>;
+    using ConicWeightsArray = skia_private::STArray<16, float>;
 public:
     /** Constructs an empty SkPathBuilder. By default, SkPathBuilder has no verbs, no SkPoint, and
         no weights. FillType is set to kWinding.
@@ -987,7 +987,13 @@ public:
         return fConicWeights;
     }
 
-    SkPathBuilder& addRaw(const SkPathRaw&);
+    enum class Reserve {
+        // Reserves the exact amount of storage needed for pathraw (never overallocates).
+        kExact,
+        // Allows the storage buffers to overallocate, based on their internal growth policy.
+        kGrow
+    };
+    SkPathBuilder& addRaw(const SkPathRaw&, Reserve);
 
     SkPathIter iter() const;
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Google LLC.
+ * Copyright 2025 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/core/SkPathTypes.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC.
+ * 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/core/SkPixelRef.h

@@ -11,6 +11,7 @@
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSize.h"
 #include "include/private/SkIDChangeListener.h"
+#include "include/private/SkPixelStorage.h"
 #include "include/private/base/SkAPI.h"
 #include "include/private/base/SkTo.h"
 
@@ -25,11 +26,13 @@ class SkDiscardableMemory;
     This class is the smart container for pixel memory, and is used with SkBitmap.
     This class can be shared/accessed between multiple threads.
 */
-class SK_API SkPixelRef : public SkRefCnt {
+class SK_API SkPixelRef : public SkPixelStorage, public SkRefCnt {
 public:
     SkPixelRef(int width, int height, void* addr, size_t rowBytes);
     ~SkPixelRef() override;
 
+    Type type() const override;
+
     SkISize dimensions() const { return {fWidth, fHeight}; }
     int width() const { return fWidth; }
     int height() const { return fHeight; }

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

@@ -10,6 +10,7 @@
 #include "include/private/base/SkAPI.h"
 
 class SkCanvas;
+class SkContentID;
 class SkSurface;
 
 namespace skcpu {
@@ -41,7 +42,7 @@ private:
     * Returns nullptr if capture is not enabled.
     */
     virtual SkCanvas* makeCaptureCanvas(SkCanvas*) = 0;
-    virtual void createCaptureBreakpoint(SkSurface*) = 0;
+    virtual SkContentID createCaptureBreakpoint(SkSurface*) = 0;
 
     friend class SkSurface_Base; // for capture functionality
 };

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

@@ -10,6 +10,7 @@
 
 #include "include/core/SkPath.h"
 #include "include/core/SkRect.h"
+#include "include/core/SkSpan.h"
 #include "include/private/base/SkAPI.h"
 #include "include/private/base/SkAssert.h"
 #include "include/private/base/SkDebug.h"
@@ -224,7 +225,12 @@ public:
 
         example: https://fiddle.skia.org/c/@Region_setRects
     */
-    bool setRects(const SkIRect rects[], int count);
+    bool setRects(SkSpan<const SkIRect> rects);
+#if !defined(SK_DISABLE_LEGACY_SKREGION_UNSPANNED_APIS)
+    bool setRects(const SkIRect rects[], int count) {
+        return this->setRects({rects, count});
+    }
+#endif
 
     /** Constructs a copy of an existing region.
         Makes two regions identical by value. Internally, region and

package/cpp/skia/include/core/SkSamplingOptions.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/core/SkSerialProcs.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.
@@ -8,6 +8,7 @@
 #ifndef SkSerialProcs_DEFINED
 #define SkSerialProcs_DEFINED
 
+#include "include/core/SkFourByteTag.h"
 #include "include/core/SkRefCnt.h"
 #include "include/private/base/SkAPI.h"
 
@@ -86,6 +87,8 @@ using SkSlugProc = sk_sp<sktext::gpu::Slug> (*)(SkReadBuffer&, void* ctx);
 using SkDeserialTypefaceStreamProc = sk_sp<SkTypeface> (*)(SkStream&, void* ctx);
 using SkDeserialTypefaceProc = sk_sp<SkTypeface> (*)(const void* data, size_t length, void* ctx);
 
+using SkDeserialAllowTagsProc = bool(*)(SkFourByteTag, void* ctx);
+
 struct SK_API SkSerialProcs {
     SkSerialPictureProc fPictureProc = nullptr;
     void*               fPictureCtx = nullptr;
@@ -115,6 +118,10 @@ struct SK_API SkDeserialProcs {
     // parameters and returns a bool). Given that there are only two valid implementations of that
     // proc, we just insert the bool directly.
     bool                         fAllowSkSL = true;
+
+    // Can be used to restrict the tags that will be deserialized from SkPictures.
+    SkDeserialAllowTagsProc      fAllowTagsProc = nullptr;
+    void*                        fAllowTagsCtx = nullptr;
 };
 
 #endif

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

@@ -36,12 +36,10 @@ struct SkSamplingOptions;
 class SK_API SkShader : public SkFlattenable {
 public:
     /**
-     *  Returns true if the shader is guaranteed to produce only opaque
-     *  colors, subject to the SkPaint using the shader to apply an opaque
-     *  alpha value. Subclasses should override this to allow some
-     *  optimizations.
+     *  Returns true if the shader is guaranteed to produce only opaque colors, subject to the
+     *  SkPaint using the shader to apply an opaque alpha value.
      */
-    virtual bool isOpaque() const { return false; }
+    virtual bool isOpaque() const = 0;
 
     /**
      *  Iff this shader is backed by a single SkImage, return its ptr (the caller must ref this

package/cpp/skia/include/core/SkSpan.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/core/SkStream.h

@@ -319,7 +319,7 @@ public:
     ~SkFILEStream() override;
 
     static std::unique_ptr<SkFILEStream> Make(const char path[]) {
-        std::unique_ptr<SkFILEStream> stream(new SkFILEStream(path));
+        auto stream = std::make_unique<SkFILEStream>(path);
         return stream->isValid() ? std::move(stream) : nullptr;
     }
 

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

@@ -0,0 +1,80 @@
+/*
+ * 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 SkStrikeRef_DEFINED
+#define SkStrikeRef_DEFINED
+
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkSpan.h"
+#include "include/core/SkTypes.h"
+
+class SkFont;
+class SkStrike;
+struct SkRect;
+
+/** \class SkStrikeRef
+    SkStrikeRef is a lightweight, thread-safe handle to a resolved font strike.
+    It caches the result of looking up an SkStrike for a particular SkFont configuration,
+    allowing repeated glyph metric queries (advances, bounds) without the overhead of
+    descriptor construction, hashing, and global cache lookup on each call.
+
+    Obtain an SkStrikeRef from SkFont::makeStrikeRef(). The returned object remains valid
+    as long as it is held; the underlying SkStrike is atomically reference counted.
+
+    SkStrikeRef does not track changes to the SkFont it was created from. If the SkFont's
+    properties change (size, typeface, hinting, etc.), a new SkStrikeRef must be obtained.
+*/
+class SK_API SkStrikeRef {
+public:
+    SkStrikeRef();
+    ~SkStrikeRef();
+
+    SkStrikeRef(const SkStrikeRef&);
+    SkStrikeRef& operator=(const SkStrikeRef&);
+    SkStrikeRef(SkStrikeRef&&);
+    SkStrikeRef& operator=(SkStrikeRef&&);
+
+    /** Returns true if this SkStrikeRef holds a valid strike. */
+    explicit operator bool() const { return fStrike != nullptr; }
+
+    /** Retrieves the advance widths for each glyph.
+        widths receives min(widths.size(), glyphs.size()) values.
+
+        @param glyphs  array of glyph indices to be measured
+        @param widths  returns text advances for each glyph, in font units
+    */
+    void getWidths(SkSpan<const SkGlyphID> glyphs, SkSpan<SkScalar> widths) const;
+
+    /** Retrieves the advance width for a single glyph.
+
+        @param glyph   glyph index to be measured
+        @return        advance width in font units
+    */
+    SkScalar getWidth(SkGlyphID glyph) const;
+
+    /** Retrieves the advance widths and bounds for each glyph.
+        widths receives min(widths.size(), glyphs.size()) values.
+        bounds receives min(bounds.size(), glyphs.size()) values.
+
+        @param glyphs  array of glyph indices to be measured
+        @param widths  returns text advances for each glyph
+        @param bounds  returns bounds for each glyph relative to (0, 0)
+    */
+    void getWidthsBounds(SkSpan<const SkGlyphID> glyphs,
+                         SkSpan<SkScalar> widths,
+                         SkSpan<SkRect> bounds) const;
+
+private:
+    friend class SkFont;
+    SkStrikeRef(sk_sp<SkStrike> strike, SkScalar strikeToSourceScale);
+
+    sk_sp<SkStrike> fStrike;
+    SkScalar fStrikeToSourceScale = 0;
+};
+
+#endif  // SkStrikeRef_DEFINED

package/cpp/skia/include/core/SkTileMode.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/core/SkVertices.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/core/SkYUVAPixmaps.h

@@ -126,12 +126,11 @@ public:
     DataType dataType() const { return fDataType; }
 
     /**
-     * Row bytes for the ith plane. Returns zero if i >= numPlanes() or this SkYUVAPixmapInfo is
-     * invalid.
+     * Row bytes for the ith plane. Returns zero if this SkYUVAPixmapInfo is invalid.
      */
     size_t rowBytes(int i) const { return fRowBytes[static_cast<size_t>(i)]; }
 
-    /** Image info for the ith plane, or default SkImageInfo if i >= numPlanes() */
+    /** Image info for the ith plane */
     const SkImageInfo& planeInfo(int i) const { return fPlaneInfos[static_cast<size_t>(i)]; }
 
     /**
@@ -234,8 +233,7 @@ public:
     const std::array<SkPixmap, kMaxPlanes>& planes() const { return fPlanes; }
 
     /**
-     * Get the ith SkPixmap plane. SkPixmap will be default initialized if i >= numPlanes or this
-     * SkYUVAPixmaps is invalid.
+     * Get the ith SkPixmap plane. SkPixmap will be default initialized if SkYUVAPixmaps is invalid.
      */
     const SkPixmap& plane(int i) const { return fPlanes[SkToSizeT(i)]; }
 

package/cpp/skia/include/docs/SkPDFDocument.h

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