@shopify/react-native-skia 2.0.0-next.3 → 2.0.0-next.5

package/apple/RNSkApplePlatformContext.h

@@ -26,7 +26,8 @@ public:
 #if !TARGET_OS_OSX
       : RNSkPlatformContext(jsCallInvoker, [[UIScreen mainScreen] scale]) {
 #else
-      : RNSkPlatformContext(jsCallInvoker, [[NSScreen mainScreen] backingScaleFactor]) {
+      : RNSkPlatformContext(jsCallInvoker,
+                            [[NSScreen mainScreen] backingScaleFactor]) {
 #endif // !TARGET_OS_OSX
 
     // Create screenshot manager

package/apple/RNSkApplePlatformContext.mm

@@ -173,7 +173,8 @@ const TextureInfo RNSkApplePlatformContext::getTexture(sk_sp<SkImage> image) {
   return result;
 }
 
-const TextureInfo RNSkApplePlatformContext::getTexture(sk_sp<SkSurface> surface) {
+const TextureInfo
+RNSkApplePlatformContext::getTexture(sk_sp<SkSurface> surface) {
   GrBackendTexture texture = SkSurfaces::GetBackendTexture(
       surface.get(), SkSurfaces::BackendHandleAccess::kFlushRead);
   TextureInfo result;
@@ -195,7 +196,7 @@ RNSkApplePlatformContext::createVideo(const std::string &url) {
 
 std::shared_ptr<WindowContext>
 RNSkApplePlatformContext::makeContextFromNativeSurface(void *surface, int width,
-                                                     int height) {
+                                                       int height) {
 #if defined(SK_GRAPHITE)
   return DawnContext::getInstance().MakeWindow(surface, width, height);
 #else
@@ -209,7 +210,7 @@ void RNSkApplePlatformContext::raiseError(const std::exception &err) {
 }
 
 sk_sp<SkSurface> RNSkApplePlatformContext::makeOffscreenSurface(int width,
-                                                              int height) {
+                                                                int height) {
 #if defined(SK_GRAPHITE)
   return DawnContext::getInstance().MakeOffscreen(width, height);
 #else
@@ -217,7 +218,8 @@ sk_sp<SkSurface> RNSkApplePlatformContext::makeOffscreenSurface(int width,
 #endif
 }
 
-sk_sp<SkImage> RNSkApplePlatformContext::makeImageFromNativeBuffer(void *buffer) {
+sk_sp<SkImage>
+RNSkApplePlatformContext::makeImageFromNativeBuffer(void *buffer) {
 #if defined(SK_GRAPHITE)
   return DawnContext::getInstance().MakeImageFromBuffer(buffer);
 #else

package/apple/RNSkAppleView.h

@@ -2,9 +2,9 @@
 
 #import <memory>
 
+#import "RNSkApplePlatformContext.h"
 #import "RNSkMetalCanvasProvider.h"
 #import "RNSkView.h"
-#import "RNSkApplePlatformContext.h"
 
 class RNSkBaseAppleView {
 public:

package/apple/RNSkAppleView.mm

@@ -1,8 +1,8 @@
 #import <memory>
 
+#import "RNSkApplePlatformContext.h"
 #import "RNSkMetalCanvasProvider.h"
 #import "RNSkView.h"
-#import "RNSkApplePlatformContext.h"
 
 class RNSkBaseAppleView {
 public:

package/apple/SkiaManager.mm

@@ -41,7 +41,8 @@ static __weak SkiaManager *sharedInstance = nil;
       // Create the RNSkiaManager (cross platform)
       _skManager = std::make_shared<RNSkia::RNSkManager>(
           jsRuntime, jsInvoker,
-          std::make_shared<RNSkia::RNSkApplePlatformContext>(bridge, jsInvoker));
+          std::make_shared<RNSkia::RNSkApplePlatformContext>(bridge,
+                                                             jsInvoker));
     }
   }
   return self;

package/apple/SkiaUIView.h

@@ -10,8 +10,8 @@
 #import <React/RCTUIKit.h>
 #endif // !TARGET_OS_OSX
 
-#import "RNSkManager.h"
 #import "RNSkAppleView.h"
+#import "RNSkManager.h"
 #import "SkiaManager.h"
 
 #if RCT_NEW_ARCH_ENABLED

package/cpp/api/JsiSkCanvas.h

@@ -243,12 +243,12 @@ public:
 
     auto jsiPoints = arguments[1].asObject(runtime).asArray(runtime);
     auto pointsSize = jsiPoints.size(runtime);
-    
+
     // Check if we have at least one point
     if (pointsSize == 0) {
       throw std::invalid_argument("Points array must not be empty");
     }
-    
+
     points.reserve(pointsSize);
 
     for (int i = 0; i < pointsSize; i++) {
@@ -280,12 +280,13 @@ public:
 
     auto jsiCubics = arguments[0].asObject(runtime).asArray(runtime);
     auto cubicsSize = jsiCubics.size(runtime);
-    
+
     // Validate cubic points - must be exactly 12 points
     if (cubicsSize != 12) {
-      throw std::invalid_argument("Cubic points array must contain exactly 12 points");
+      throw std::invalid_argument(
+          "Cubic points array must contain exactly 12 points");
     }
-    
+
     cubics.reserve(cubicsSize);
     for (int i = 0; i < cubicsSize; i++) {
       std::shared_ptr<SkPoint> point = JsiSkPoint::fromValue(
@@ -296,12 +297,13 @@ public:
     if (count >= 2 && !arguments[1].isNull() && !arguments[1].isUndefined()) {
       auto jsiColors = arguments[1].asObject(runtime).asArray(runtime);
       auto colorsSize = jsiColors.size(runtime);
-      
+
       // Validate colors array - must be exactly 4 colors
       if (colorsSize != 4) {
-        throw std::invalid_argument("Colors array must contain exactly 4 colors");
+        throw std::invalid_argument(
+            "Colors array must contain exactly 4 colors");
       }
-      
+
       colors.reserve(colorsSize);
       for (int i = 0; i < colorsSize; i++) {
         SkColor color = JsiSkColor::fromValue(
@@ -313,12 +315,13 @@ public:
     if (count >= 3 && !arguments[2].isNull() && !arguments[2].isUndefined()) {
       auto jsiTexs = arguments[2].asObject(runtime).asArray(runtime);
       auto texsSize = jsiTexs.size(runtime);
-      
+
       // Validate textures array - must be exactly 4 points
       if (texsSize != 4) {
-        throw std::invalid_argument("Texture coordinates array must contain exactly 4 points");
+        throw std::invalid_argument(
+            "Texture coordinates array must contain exactly 4 points");
       }
-      
+
       texs.reserve(texsSize);
       for (int i = 0; i < texsSize; i++) {
         auto point = JsiSkPoint::fromValue(
@@ -330,9 +333,8 @@ public:
     auto paint =
         count >= 4 ? JsiSkPaint::fromValue(runtime, arguments[4]) : nullptr;
     auto blendMode = static_cast<SkBlendMode>(arguments[3].asNumber());
-    _canvas->drawPatch(cubics.data(), colors.empty() ? nullptr : colors.data(), 
-                       texs.empty() ? nullptr : texs.data(), blendMode,
-                       *paint);
+    _canvas->drawPatch(cubics.data(), colors.empty() ? nullptr : colors.data(),
+                       texs.empty() ? nullptr : texs.data(), blendMode, *paint);
     return jsi::Value::undefined();
   }
 
@@ -389,12 +391,13 @@ public:
 
     std::vector<SkGlyphID> glyphs;
     int glyphsSize = static_cast<int>(jsiGlyphs.size(runtime));
-    
+
     // Validate that glyphs and positions arrays have the same size
     if (glyphsSize != pointsSize) {
-      throw std::invalid_argument("Glyphs and positions arrays must have the same length");
+      throw std::invalid_argument(
+          "Glyphs and positions arrays must have the same length");
     }
-    
+
     glyphs.reserve(glyphsSize);
     for (int i = 0; i < glyphsSize; i++) {
       glyphs.push_back(jsiGlyphs.getValueAtIndex(runtime, i).asNumber());
@@ -553,22 +556,24 @@ public:
           runtime, rects.getValueAtIndex(runtime, i).asObject(runtime));
       skRects.push_back(*rect.get());
     }
-    
+
     // Validate transforms and rects have the same size
     if (xformsSize != rectsSize) {
-      throw std::invalid_argument("Transforms and rects arrays must have the same length");
+      throw std::invalid_argument(
+          "Transforms and rects arrays must have the same length");
     }
 
     std::vector<SkColor> colors;
     if (count > 5 && !arguments[5].isUndefined()) {
       auto colorsArray = arguments[5].asObject(runtime).asArray(runtime);
       int colorsSize = static_cast<int>(colorsArray.size(runtime));
-      
+
       // Validate colors array matches the size of sprites and transforms
       if (colorsSize != rectsSize) {
-        throw std::invalid_argument("Colors array must have the same length as rects/transforms");
+        throw std::invalid_argument(
+            "Colors array must have the same length as rects/transforms");
       }
-      
+
       colors.reserve(colorsSize);
       for (int i = 0; i < colorsSize; i++) {
         // Convert from [r,g,b,a] in [0,1] to SkColor
@@ -593,9 +598,8 @@ public:
       sampling = SamplingOptionsFromValue(runtime, arguments[6]);
     }
     _canvas->drawAtlas(atlas.get(), xforms.data(), skRects.data(),
-                       colors.empty() ? nullptr : colors.data(), 
-                       skRects.size(), blendMode, sampling,
-                       nullptr, paint.get());
+                       colors.empty() ? nullptr : colors.data(), skRects.size(),
+                       blendMode, sampling, nullptr, paint.get());
 
     return jsi::Value::undefined();
   }

package/cpp/api/recorder/Drawings.h

@@ -639,12 +639,14 @@ public:
   void draw(DrawingCtx *ctx) {
     // Validate colors array has exactly 4 colors if provided
     if (props.colors.has_value() && props.colors.value().size() != 4) {
-      throw std::invalid_argument("Colors array for patch must have exactly 4 colors");
+      throw std::invalid_argument(
+          "Colors array for patch must have exactly 4 colors");
     }
-    
+
     // Validate texture array has exactly 4 points if provided
     if (props.texture.has_value() && props.texture.value().size() != 4) {
-      throw std::invalid_argument("Texture coordinates array for patch must have exactly 4 points");
+      throw std::invalid_argument(
+          "Texture coordinates array for patch must have exactly 4 points");
     }
 
     // Determine default blend mode based on presence of colors
@@ -686,15 +688,6 @@ public:
   }
 
   void draw(DrawingCtx *ctx) {
-    // Validate array sizes
-    if (props.colors.has_value() && props.colors.value().size() != props.vertices.size()) {
-      throw std::invalid_argument("Colors array must have the same size as vertices array");
-    }
-    
-    if (props.textures.has_value() && props.textures.value().size() != props.vertices.size()) {
-      throw std::invalid_argument("Textures array must have the same size as vertices array");
-    }
-
     // Create vertices using MakeCopy
     auto vertices = SkVertices::MakeCopy(
         props.mode, static_cast<int>(props.vertices.size()),
@@ -930,14 +923,17 @@ public:
     if (props.image) {
       // Validate transforms and sprites have the same size
       if (props.transforms.size() != props.sprites.size()) {
-        throw std::invalid_argument("transforms and sprites arrays must have the same length");
+        throw std::invalid_argument(
+            "transforms and sprites arrays must have the same length");
       }
-      
+
       // Validate colors array matches if provided
-      if (props.colors.has_value() && props.colors.value().size() != props.transforms.size()) {
-        throw std::invalid_argument("colors array must have the same length as transforms/sprites");
+      if (props.colors.has_value() &&
+          props.colors.value().size() != props.transforms.size()) {
+        throw std::invalid_argument(
+            "colors array must have the same length as transforms/sprites");
       }
-      
+
       auto colors =
           props.colors.has_value() ? props.colors.value().data() : nullptr;
       auto blendMode = props.blendMode.value_or(SkBlendMode::kDstOver);

package/cpp/api/recorder/Shaders.h

@@ -239,16 +239,13 @@ public:
   }
 
   void pushShader(DrawingCtx *ctx) {
-    // Validate colors array has at least 2 colors
-    if (props.colors.size() < 2) {
-      throw std::invalid_argument("Colors array must have at least 2 colors");
-    }
-    
     // Validate positions array matches colors array in size
-    if (props.positions.has_value() && props.positions.value().size() != props.colors.size()) {
-      throw std::invalid_argument("Positions array must have the same size as colors array");
+    if (props.positions.has_value() &&
+        props.positions.value().size() != props.colors.size()) {
+      throw std::invalid_argument(
+          "Positions array must have the same size as colors array");
     }
-    
+
     SkMatrix m3 = processTransform(props.matrix, props.transform, props.origin);
     const SkPoint pts[2] = {props.start, props.end};
     auto shader = SkGradientShader::MakeLinear(
@@ -286,16 +283,13 @@ public:
   }
 
   void pushShader(DrawingCtx *ctx) {
-    // Validate colors array has at least 2 colors
-    if (props.colors.size() < 2) {
-      throw std::invalid_argument("Colors array must have at least 2 colors");
-    }
-    
     // Validate positions array matches colors array in size
-    if (props.positions.has_value() && props.positions.value().size() != props.colors.size()) {
-      throw std::invalid_argument("Positions array must have the same size as colors array");
+    if (props.positions.has_value() &&
+        props.positions.value().size() != props.colors.size()) {
+      throw std::invalid_argument(
+          "Positions array must have the same size as colors array");
     }
-    
+
     SkMatrix m3 = processTransform(props.matrix, props.transform, props.origin);
     auto shader = SkGradientShader::MakeRadial(
         props.center, props.radius, props.colors.data(),
@@ -334,16 +328,13 @@ public:
   }
 
   void pushShader(DrawingCtx *ctx) {
-    // Validate colors array has at least 2 colors
-    if (props.colors.size() < 2) {
-      throw std::invalid_argument("Colors array must have at least 2 colors");
-    }
-    
     // Validate positions array matches colors array in size
-    if (props.positions.has_value() && props.positions.value().size() != props.colors.size()) {
-      throw std::invalid_argument("Positions array must have the same size as colors array");
+    if (props.positions.has_value() &&
+        props.positions.value().size() != props.colors.size()) {
+      throw std::invalid_argument(
+          "Positions array must have the same size as colors array");
     }
-    
+
     SkMatrix m3 = processTransform(props.matrix, props.transform, props.origin);
     auto shader = SkGradientShader::MakeSweep(
         props.center.x(), props.center.y(), props.colors.data(),
@@ -385,16 +376,14 @@ public:
   }
 
   void pushShader(DrawingCtx *ctx) {
-    // Validate colors array has at least 2 colors
-    if (props.colors.size() < 2) {
-      throw std::invalid_argument("Colors array must have at least 2 colors");
-    }
-    
+
     // Validate positions array matches colors array in size
-    if (props.positions.has_value() && props.positions.value().size() != props.colors.size()) {
-      throw std::invalid_argument("Positions array must have the same size as colors array");
+    if (props.positions.has_value() &&
+        props.positions.value().size() != props.colors.size()) {
+      throw std::invalid_argument(
+          "Positions array must have the same size as colors array");
     }
-    
+
     SkMatrix m3 = processTransform(props.matrix, props.transform, props.origin);
     auto shader = SkGradientShader::MakeTwoPointConical(
         props.start, props.startRadius, props.end, props.endRadius,

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

@@ -784,12 +784,46 @@ public:
      *
      *  As such, future decoding calls may require a rewind.
      *
-     *  For still (non-animated) image codecs, this will return 0.
+     *  `getRepetitionCount` will return `0` in two cases:
+     *  1. Still (non-animated) images.
+     *  2. Animated images that only play the animation once (i.e. that don't
+     *     repeat the animation)
+     *  `isAnimated` can be used to disambiguate between these two cases.
      */
     int getRepetitionCount() {
         return this->onGetRepetitionCount();
     }
 
+    /**
+     * `isAnimated` returns whether the full input is expected to contain an
+     * animated image (i.e. more than 1 image frame).  This can be used to
+     * disambiguate the meaning of `getRepetitionCount` returning `0` (see
+     * `getRepetitionCount`'s doc comment for more details).
+     *
+     * Note that in some codecs `getFrameCount()` only returns the number of
+     * frames for which all the metadata has been already successfully decoded.
+     * Therefore for a partial input `isAnimated()` may return "yes", even
+     * though `getFrameCount()` may temporarily return `1` until more of the
+     * input is available.
+     *
+     * When handling partial input, some codecs may not know until later (e.g.
+     * until encountering additional image frames) whether the given image has
+     * more than one frame.  Such codecs may initially return
+     * `IsAnimated::kUnknown` and only later give a definitive "yes" or "no"
+     * answer.  GIF format is one example where this may happen.
+     *
+     * Other codecs may be able to decode the information from the metadata
+     * present before the first image frame.  Such codecs should be able to give
+     * a definitive "yes" or "no" answer as soon as they are constructed.  PNG
+     * format is one example where this happens.
+     */
+    enum class IsAnimated {
+        kYes,
+        kNo,
+        kUnknown,
+    };
+    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.
@@ -937,6 +971,10 @@ protected:
         return 0;
     }
 
+    virtual IsAnimated onIsAnimated() {
+        return IsAnimated::kNo;
+    }
+
 private:
     const SkEncodedInfo                fEncodedInfo;
     XformFormat                        fSrcXformFormat;

package/cpp/skia/include/config/SkUserConfig.h

@@ -80,16 +80,6 @@
 */
 //#define SK_CANVAS_SAVE_RESTORE_PREALLOC_COUNT 32
 
-/* Determines whether to build code that supports the Ganesh GPU backend. Some classes
-   that are not GPU-specific, such as SkShader subclasses, have optional code
-   that is used allows them to interact with this GPU backend. If you'd like to
-   include this code, include -DSK_GANESH in your cflags or uncomment below.
-   Defaults to not set (No Ganesh GPU backend).
-   This define affects the ABI of Skia, so make sure it matches the client which uses
-   the compiled version of Skia.
-*/
-//#define SK_GANESH
-
 /* Skia makes use of histogram logging macros to trace the frequency of
    events. By default, Skia provides no-op versions of these macros.
    Skia consumers can provide their own definitions of these macros to
@@ -99,6 +89,7 @@
 //#define SK_HISTOGRAM_ENUMERATION(name, sampleEnum, enumSize)
 //#define SK_HISTOGRAM_EXACT_LINEAR(name, sample, valueMax)
 //#define SK_HISTOGRAM_MEMORY_KB(name, sample)
+//#define SK_HISTOGRAM_CUSTOM_COUNTS(name, sample, countMin, countMax, bucketCount)
 //#define SK_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES(name, sampleUSec, minUSec, maxUSec, bucketCount)
 
 /*

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

@@ -54,6 +54,7 @@ class GrRecordingContext;
 
 class SkBitmap;
 class SkBlender;
+class SkBlurMaskFilterImpl;
 class SkColorSpace;
 class SkData;
 class SkDevice;
@@ -2679,11 +2680,14 @@ private:
     // into the canvas' global space.
     SkRect computeDeviceClipBounds(bool outsetForAA=true) const;
 
-    // Attempt to draw a rrect with an analytic blur. If the paint does not contain a blur, or the
-    // geometry can't be drawn with an analytic blur by the device, a layer is returned for a
-    // regular draw. If the draw succeeds or predrawNotify fails, nullopt is returned indicating
-    // that nothing further should be drawn.
+    // Returns the paint's mask filter if it can be used to draw an rrect with an analytic blur, and
+    // returns null otherwise.
+    const SkBlurMaskFilterImpl* canAttemptBlurredRRectDraw(const SkPaint&) const;
+
+    // Attempt to draw a rrect with an analytic blur. If the draw succeeds or predrawNotify fails,
+    // nullopt is returned indicating that nothing further should be drawn.
     std::optional<AutoLayerForImageFilter> attemptBlurredRRectDraw(const SkRRect&,
+                                                                   const SkBlurMaskFilterImpl*,
                                                                    const SkPaint&,
                                                                    SkEnumBitMask<PredrawFlags>);
 

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

@@ -91,13 +91,13 @@ public:
             return *this;
         }
 
-        bool operator==(const ForwardVerbIterator& other) {
+        bool operator==(const ForwardVerbIterator& other) const {
             SkASSERT(fSegments.data() != other.fSegments.data() ||
                      fSegments.size() == other.fSegments.size());
             return fSegments.data() == other.fSegments.data();
         }
 
-        bool operator!=(const ForwardVerbIterator& other) {
+        bool operator!=(const ForwardVerbIterator& other) const {
             return !((*this) == other);
         }
 

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

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

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

@@ -317,15 +317,18 @@ public:
     */
     SkScalar getStrokeMiter() const { return fMiterLimit; }
 
-    /** Sets the limit at which a sharp corner is drawn beveled.
-        Valid values are zero and greater.
-        Has no effect if miter is less than zero.
+    /** When stroking a small joinAngle with miter, the miterLength may be very long.
+        When miterLength > maxMiterLength (or joinAngle < minJoinAngle) the join will become bevel.
+        miterLimit = maxMiterLength / strokeWidth or miterLimit = 1 / sin(minJoinAngle / 2).
 
-        @param miter  zero and greater miter limit
+        This call has no effect if the miterLimit passed is less than zero.
+        Values less than one will be treated as bevel.
+
+        @param miterLimit  zero and greater miter limit
 
         example: https://fiddle.skia.org/c/@Paint_setStrokeMiter
     */
-    void setStrokeMiter(SkScalar miter);
+    void setStrokeMiter(SkScalar miterLimit);
 
     /** \enum SkPaint::Cap
         Cap draws at the beginning and end of an open path contour.

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

@@ -79,10 +79,12 @@ public:
     [[nodiscard]] bool readS8(int8_t*);
     [[nodiscard]] bool readS16(int16_t*);
     [[nodiscard]] bool readS32(int32_t*);
+    [[nodiscard]] bool readS64(int64_t*);
 
-    [[nodiscard]] bool readU8(uint8_t* i) { return this->readS8((int8_t*)i); }
+    [[nodiscard]] bool readU8(uint8_t* i)   { return this->readS8((int8_t*)i); }
     [[nodiscard]] bool readU16(uint16_t* i) { return this->readS16((int16_t*)i); }
     [[nodiscard]] bool readU32(uint32_t* i) { return this->readS32((int32_t*)i); }
+    [[nodiscard]] bool readU64(uint64_t* i) { return this->readS64((int64_t*)i); }
 
     [[nodiscard]] bool readBool(bool* b) {
         uint8_t i;
@@ -240,8 +242,11 @@ public:
         uint16_t v = SkToU16(value);
         return this->write(&v, 2);
     }
-    bool write32(uint32_t v) {
-        return this->write(&v, 4);
+    bool write32(uint32_t value) {
+        return this->write(&value, 4);
+    }
+    bool write64(uint64_t value) {
+        return this->write(&value, 8);
     }
 
     bool writeText(const char text[]) {

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

@@ -209,13 +209,13 @@ public:
     class SK_API Iter {
     public:
         struct Run {
-            SkTypeface*     fTypeface;
-            int             fGlyphCount;
-            const uint16_t* fGlyphIndices;
+            SkTypeface* fTypeface;
+            int fGlyphCount;
+            const SkGlyphID* fGlyphIndices;
 #ifdef SK_UNTIL_CRBUG_1187654_IS_FIXED
             const uint32_t* fClusterIndex_forTest;
-            int             fUtf8Size_forTest;
-            const char*     fUtf8_forTest;
+            int fUtf8Size_forTest;
+            const char* fUtf8_forTest;
 #endif
         };
 
@@ -229,10 +229,10 @@ public:
 
         // Experimental, DO NO USE, will change/go-away
         struct ExperimentalRun {
-            SkFont          font;
-            int             count;
-            const uint16_t* glyphs;
-            const SkPoint*  positions;
+            SkFont font;
+            int count;
+            const SkGlyphID* glyphs;
+            const SkPoint* positions;
         };
         bool experimentalNext(ExperimentalRun*);
 

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

@@ -366,12 +366,10 @@ protected:
     virtual bool onGetFixedPitch() const; // TODO: = 0;
 
     // Must return a valid scaler context. It can not return nullptr.
-    virtual std::unique_ptr<SkScalerContext> onCreateScalerContext(const SkScalerContextEffects&,
-                                                                   const SkDescriptor*) const = 0;
+    virtual std::unique_ptr<SkScalerContext> onCreateScalerContext(
+        const SkScalerContextEffects&, const SkDescriptor*) const = 0;
     virtual std::unique_ptr<SkScalerContext> onCreateScalerContextAsProxyTypeface
-                                                                  (const SkScalerContextEffects&,
-                                                                   const SkDescriptor*,
-                                                                   sk_sp<SkTypeface>) const;
+        (const SkScalerContextEffects&, const SkDescriptor*, SkTypeface* proxyTypeface) const;
     virtual void onFilterRec(SkScalerContextRec*) const = 0;
     friend class SkScalerContext;  // onFilterRec
 
@@ -442,8 +440,8 @@ private:
     friend class SkRandomTypeface;   // getAdvancedMetrics
     friend class SkPDFFont;          // getAdvancedMetrics
     friend class SkTypeface_proxy;
-
     friend class SkFontPriv;         // getGlyphToUnicodeMap
+    friend void TestSkTypefaceGlyphToUnicodeMap(SkTypeface&, SkUnichar*);
 
 private:
     SkTypefaceID        fUniqueID;

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

@@ -97,6 +97,7 @@
     defined(SK_HISTOGRAM_BOOLEAN)      || \
     defined(SK_HISTOGRAM_EXACT_LINEAR) || \
     defined(SK_HISTOGRAM_MEMORY_KB)    || \
+    defined(SK_HISTOGRAM_CUSTOM_COUNTS)|| \
     defined(SK_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES)
 #  define SK_HISTOGRAMS_ENABLED 1
 #else
@@ -119,6 +120,10 @@
 #  define SK_HISTOGRAM_MEMORY_KB(name, sample)
 #endif
 
+#ifndef SK_HISTOGRAM_CUSTOM_COUNTS
+#  define SK_HISTOGRAM_CUSTOM_COUNTS(name, sample, countMin, countMax, bucketCount)
+#endif
+
 #ifndef SK_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES
 #  define SK_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES(name, sampleUSec, minUSec, maxUSec, bucketCount)
 #endif