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

package/android/cpp/rnskia-android/RNSkAndroidPlatformContext.h

@@ -63,16 +63,6 @@ public:
 #endif
   }
 
-  std::shared_ptr<WindowContext>
-  makeContextFromNativeSurface(void *surface, int width, int height) override {
-#if defined(SK_GRAPHITE)
-    return DawnContext::getInstance().MakeWindow(surface, width, height);
-#else
-    auto aWindow = reinterpret_cast<ANativeWindow *>(surface);
-    return OpenGLContext::getInstance().MakeWindow(aWindow);
-#endif
-  }
-
   sk_sp<SkImage> makeImageFromNativeBuffer(void *buffer) override {
 #if defined(SK_GRAPHITE)
     return DawnContext::getInstance().MakeImageFromBuffer(buffer);

package/android/src/main/java/com/shopify/reactnative/skia/ViewScreenshotService.java

@@ -19,10 +19,11 @@ import android.widget.ScrollView;
 import androidx.annotation.NonNull;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.UIManager;
+import com.facebook.react.uimanager.BackgroundStyleApplicator;
 import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.views.view.ReactViewGroup;
 
-import java.lang.reflect.Method;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -118,17 +119,13 @@ public class ViewScreenshotService {
     }
 
     private static void drawChildren(Canvas canvas, ViewGroup group, Paint paint, float parentOpacity) {
-        // Handle clipping for ReactViewGroup
-        if (group instanceof ReactViewGroup) {
-            try {
-                Class[] cArg = new Class[1];
-                cArg[0] = Canvas.class;
-                Method method = ReactViewGroup.class.getDeclaredMethod("dispatchOverflowDraw", cArg);
-                method.setAccessible(true);
-                method.invoke(group, canvas);
-            } catch (Exception e) {
-                Log.e(TAG, "couldn't invoke dispatchOverflowDraw() on ReactViewGroup", e);
-            }
+        // ReactViewGroup applies `overflow: hidden` / `overflow: scroll` clipping from its
+        // dispatchDraw() override. We never call dispatchDraw() here because children are
+        // walked manually (TextureView / SurfaceView need special handling), so the clip has
+        // to be replicated explicitly, exactly as ReactViewGroup.dispatchDraw() does it.
+        if (group instanceof ReactViewGroup
+                && !ViewProps.VISIBLE.equals(((ReactViewGroup) group).getOverflow())) {
+            BackgroundStyleApplicator.clipToPaddingBox(group, canvas);
         }
         for (int i = 0; i < group.getChildCount(); i++) {
             View child = group.getChildAt(i);

package/apple/RNSkApplePlatformContext.h

@@ -63,9 +63,6 @@ public:
 
   std::shared_ptr<RNSkVideo> createVideo(const std::string &url) override;
 
-  std::shared_ptr<WindowContext>
-  makeContextFromNativeSurface(void *surface, int width, int height) override;
-
   virtual void performStreamOperation(
       const std::string &sourceUri,
       const std::function<void(std::unique_ptr<SkStreamAsset>)> &op) override;

package/apple/RNSkApplePlatformContext.mm

@@ -307,17 +307,6 @@ RNSkApplePlatformContext::createVideo(const std::string &url) {
   return std::make_shared<RNSkAppleVideo>(url, this);
 }
 
-std::shared_ptr<WindowContext>
-RNSkApplePlatformContext::makeContextFromNativeSurface(void *surface, int width,
-                                                       int height) {
-#if defined(SK_GRAPHITE)
-  return DawnContext::getInstance().MakeWindow(surface, width, height);
-#else
-  return MetalContext::getInstance().MakeWindow((__bridge CALayer *)surface,
-                                                width, height);
-#endif
-}
-
 void RNSkApplePlatformContext::raiseError(const std::exception &err) {
   RCTFatal(RCTErrorWithMessage([NSString stringWithUTF8String:err.what()]));
 }

package/cpp/api/JsiSkApi.h

@@ -56,7 +56,6 @@
 #include "JsiSkTypefaceFactory.h"
 #include "JsiSkTypefaceFontProviderFactory.h"
 #include "JsiSkVertices.h"
-#include "JsiSkiaContext.h"
 #include "JsiSkottieFactory.h"
 #include "JsiVideo.h"
 #include "api/recorder/JsiRecorder.h"
@@ -116,10 +115,6 @@ public:
     return JsiVideo::createCtor(getContext())(runtime, thisValue, arguments,
                                               count);
   }
-  JSI_HOST_FUNCTION(Context) {
-    return JsiSkiaContext::createCtor(getContext())(runtime, thisValue,
-                                                    arguments, count);
-  }
   JSI_HOST_FUNCTION(Font) {
     return JsiSkFont::createCtor(getContext())(runtime, thisValue, arguments,
                                                count);
@@ -256,7 +251,6 @@ public:
 
   static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
     installHostMethod(runtime, prototype, "Video", &JsiSkApi::Video);
-    installHostMethod(runtime, prototype, "Context", &JsiSkApi::Context);
     installHostMethod(runtime, prototype, "getNativeDevice",
                       &JsiSkApi::getNativeDevice);
     installHostMethod(runtime, prototype, "Font", &JsiSkApi::Font);

package/cpp/api/JsiSkFont.h

@@ -161,15 +161,9 @@ public:
 
   void setSize(double size) { getObject()->setSize(size); }
 
-  // The JS API declares booleans here, but the previous implementation read
-  // the arguments with asNumber() — keep accepting numbers.
-  void setEmbolden(double embolden) {
-    getObject()->setEmbolden(static_cast<bool>(embolden));
-  }
+  void setEmbolden(bool embolden) { getObject()->setEmbolden(embolden); }
 
-  void setSubpixel(double subpixel) {
-    getObject()->setSubpixel(static_cast<bool>(subpixel));
-  }
+  void setSubpixel(bool subpixel) { getObject()->setSubpixel(subpixel); }
 
   void setTypeface(std::variant<std::nullptr_t, sk_sp<SkTypeface>> typeface) {
     getObject()->setTypeface(

package/cpp/api/JsiSkMatrix.h

@@ -69,12 +69,14 @@ public:
 
   void postTranslate(double x, double y) { getObject()->postTranslate(x, y); }
 
+  // A missing y means a uniform scale, matching the CanvasKit backend and the
+  // SkMatrix type, where y is optional rather than defaulted to 1.
   void scale(double x, JsiOptional<double> y) {
-    getObject()->preScale(x, y.has_value() ? *y : 1);
+    getObject()->preScale(x, y.has_value() ? *y : x);
   }
 
   void postScale(double x, JsiOptional<double> y) {
-    getObject()->postScale(x, y.has_value() ? *y : 1);
+    getObject()->postScale(x, y.has_value() ? *y : x);
   }
 
   void skew(double x, double y) { getObject()->preSkew(x, y); }

package/cpp/api/recorder/Convertor.h

@@ -69,7 +69,51 @@ template <typename T> struct unwrap_optional<std::optional<T>> {
 template <typename T>
 T getPropertyValue(jsi::Runtime &runtime, const jsi::Value &value);
 
-// Base template for convertProperty
+template <typename T, typename Target>
+bool convertSelectorProperty(jsi::Runtime &runtime, const jsi::Value &prop,
+                             Target &target, Variables &variables) {
+  if (!prop.isObject()) {
+    return false;
+  }
+  auto wrapper = prop.asObject(runtime);
+  if (!wrapper.hasProperty(runtime, "__sv") ||
+      !wrapper.hasProperty(runtime, "__key")) {
+    return false;
+  }
+  auto svVal = wrapper.getProperty(runtime, "__sv");
+  auto keyVal = wrapper.getProperty(runtime, "__key");
+  if (!isSharedValue(runtime, svVal) || !keyVal.isString()) {
+    return false;
+  }
+  auto sharedValue = svVal.asObject(runtime);
+  auto key = keyVal.asString(runtime).utf8(runtime);
+  auto name =
+      sharedValue.getProperty(runtime, "name").asString(runtime).utf8(runtime);
+
+  auto conv = [target = &target, key](jsi::Runtime &runtime,
+                                      const jsi::Object &val) {
+    auto value = val.getProperty(runtime, "value");
+    if (!value.isObject()) {
+      return;
+    }
+    auto values = value.asObject(runtime);
+    if (!values.hasProperty(runtime, key.c_str())) {
+      return;
+    }
+
+    auto selected = values.getProperty(runtime, key.c_str());
+    if (selected.isUndefined() || selected.isNull() ||
+        (selected.isObject() && selected.asObject(runtime).isFunction(runtime))) {
+      return;
+    }
+    *target = getPropertyValue<T>(runtime, selected);
+  };
+
+  variables[name].push_back(conv);
+  conv(runtime, sharedValue);
+  return true;
+}
+
 template <typename T, typename Target>
 void convertPropertyImpl(jsi::Runtime &runtime, const jsi::Object &object,
                          const std::string &propertyName, Target &target,
@@ -78,13 +122,16 @@ void convertPropertyImpl(jsi::Runtime &runtime, const jsi::Object &object,
     return;
   }
 
-  auto property = object.getProperty(runtime, propertyName.c_str());
+  auto prop = object.getProperty(runtime, propertyName.c_str());
+
+  if (convertSelectorProperty<T>(runtime, prop, target, variables)) {
+    return;
+  }
 
-  if (isSharedValue(runtime, property)) {
-    auto sharedValue = property.asObject(runtime);
-    auto name = sharedValue.getProperty(runtime, "name")
-                    .asString(runtime)
-                    .utf8(runtime);
+  if (isSharedValue(runtime, prop)) {
+    auto sharedValue = prop.asObject(runtime);
+    auto name =
+        sharedValue.getProperty(runtime, "name").asString(runtime).utf8(runtime);
     auto conv = [target = &target](jsi::Runtime &runtime,
                                    const jsi::Object &val) {
       auto value = val.getProperty(runtime, "value");
@@ -92,9 +139,10 @@ void convertPropertyImpl(jsi::Runtime &runtime, const jsi::Object &object,
     };
     variables[name].push_back(conv);
     conv(runtime, sharedValue);
-  } else {
-    target = getPropertyValue<T>(runtime, property);
+    return;
   }
+
+  target = getPropertyValue<T>(runtime, prop);
 }
 
 // Main convertProperty template
@@ -313,13 +361,16 @@ SkM44 getPropertyValue(jsi::Runtime &runtime, const jsi::Value &value) {
         m4.preScale(1, s);
       } else if (key == "skewX") {
         auto angle = value.getProperty(runtime, key.c_str()).asNumber();
-        SkM44 skewX(1, 0, 0, 0, std::tan(angle), 1, 0, 0, 0, 0, 1, 0, 0, 0, 0,
+        // The SkM44 constructor takes its arguments in row-major reading
+        // order, so the shear factor of a horizontal skew belongs in row 0,
+        // where it scales y into x.
+        SkM44 skewX(1, std::tan(angle), 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0,
                     1);
         m4.preConcat(skewX);
 
       } else if (key == "skewY") {
         auto angle = value.getProperty(runtime, key.c_str()).asNumber();
-        SkM44 skewY(1, std::tan(angle), 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0,
+        SkM44 skewY(1, 0, 0, 0, std::tan(angle), 1, 0, 0, 0, 0, 1, 0, 0, 0, 0,
                     1);
         m4.preConcat(skewY);
       } else if (key == "rotate" || key == "rotateZ") {

package/cpp/api/recorder/Drawings.h

@@ -149,6 +149,9 @@ public:
       if (hasStrokeOptions) {
         const auto &stroke = props.stroke.value();
         SkPaint strokePaint;
+        // A default SkPaint is fill-style, and FillPathWithPaint only
+        // outlines a paint that strokes.
+        strokePaint.setStyle(SkPaint::kStroke_Style);
 
         if (stroke.cap.has_value()) {
           strokePaint.setStrokeCap(stroke.cap.value());
@@ -166,11 +169,18 @@ public:
           strokePaint.setStrokeMiter(stroke.miter_limit.value());
         }
 
+        float precision = stroke.precision.value_or(1.0f);
+
         SkPathBuilder resultBuilder;
-        if (!skpathutils::FillPathWithPaint(*p, strokePaint, &resultBuilder)) {
-          throw std::runtime_error("Failed to apply stroke to path");
+        auto ctm = SkMatrix::Scale(precision, precision);
+        if (skpathutils::FillPathWithPaint(*p, strokePaint, &resultBuilder,
+                                           nullptr, ctm)) {
+          pathToUse = std::make_shared<const SkPath>(resultBuilder.snapshot());
+        } else {
+          // The JS player keeps the unstroked path when Path.Stroke returns
+          // null (e.g. a hairline width of 0).
+          pathToUse = std::const_pointer_cast<const SkPath>(p);
         }
-        pathToUse = std::make_shared<const SkPath>(resultBuilder.snapshot());
       } else {
         pathToUse = std::const_pointer_cast<const SkPath>(p);
       }

package/cpp/api/recorder/ImageFilters.h

@@ -135,8 +135,22 @@ private:
     auto sourceAlpha = SkImageFilters::ColorFilter(
         SkColorFilters::Blend(SK_ColorBLACK, SkBlendMode::kSrcIn), nullptr);
 
+    // The shadow is generated outside the shape and then clipped back into it,
+    // so "outside" has to be the complement of the shape's silhouette. Taking
+    // SrcOut against the source graphic itself makes it the complement of the
+    // source's *alpha*: inside a translucent shape 1 - alpha is non-zero, so
+    // the shadow is generated across the whole interior and tints it, no matter
+    // how small the blur and the offset are (issue #2990). Saturating alpha
+    // first keeps the shadow tied to the shape's outline instead of to its
+    // opacity. 255 is the saturation point of an 8-bit alpha channel, so one
+    // unit of coverage is enough to reach 1.
+    static constexpr float kAlphaSaturate[20] = {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0};
+    auto coverage = SkImageFilters::ColorFilter(
+        SkColorFilters::Matrix(kAlphaSaturate), nullptr);
+
     auto f1 = SkImageFilters::ColorFilter(
-        SkColorFilters::Blend(color, SkBlendMode::kSrcOut), nullptr);
+        SkColorFilters::Blend(color, SkBlendMode::kSrcOut), coverage);
 
     auto f2 = SkImageFilters::Offset(dx, dy, f1);
     auto f3 = SkImageFilters::Blur(sigmaX, sigmaY, SkTileMode::kDecal, f2);

package/cpp/api/recorder/Paint.h

@@ -154,8 +154,11 @@ public:
     }
     ctx->savePaint();
     if (standalone) {
-      SkPaint freshPaint;
-      ctx->pushPaint(freshPaint);
+      // Reset the paint that savePaint() just pushed instead of pushing a
+      // second one: the matching RestorePaintDeclaration pops a single frame,
+      // so an extra push would leave the enclosing group's opacity on the
+      // stack and leak it onto every sibling drawn afterwards.
+      ctx->getPaint() = SkPaint();
     }
     auto &paint = ctx->getPaint();
     if (props.opacity.has_value()) {

package/cpp/api/third_party/SkottieUtils.cpp

@@ -10,7 +10,7 @@
 #include "include/core/SkData.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkSize.h"
-#include "include/private/base/SkAssert.h"
+#include "include/private/SkAssert.h"
 #include "modules/skottie/include/Skottie.h"
 #include "modules/skresources/include/SkResources.h"
 

package/cpp/rnskia/RNSkPlatformContext.h

@@ -96,9 +96,6 @@ public:
   virtual sk_sp<SkSurface>
   makeOffscreenSurface(int width, int height, bool useP3ColorSpace = false) = 0;
 
-  virtual std::shared_ptr<WindowContext>
-  makeContextFromNativeSurface(void *surface, int width, int height) = 0;
-
   /**
    * Creates an image from a native buffer.
    * - On iOS, this is a `CVPixelBufferRef`

package/cpp/skia/include/android/SkAndroidFrameworkUtils.h

@@ -39,8 +39,6 @@ public:
 
     static void SafetyNetLog(const char*);
 
-    static sk_sp<SkSurface> getSurfaceFromCanvas(SkCanvas* canvas);
-
     static int SaveBehind(SkCanvas* canvas, const SkRect* subset);
 
     // Operating within the canvas' clip stack, this resets the geometry of the clip to be wide

package/cpp/skia/include/android/vk/AndroidVulkanMemoryAllocator.h

@@ -9,7 +9,7 @@
 #define AndroidVulkanMemoryAllocator_DEFINED
 
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 namespace skgpu {
 struct VulkanBackendContext;

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

@@ -15,7 +15,7 @@
 #include "include/core/SkSize.h"
 #include "include/core/SkTypes.h"
 #include "include/private/SkEncodedInfo.h"
-#include "include/private/base/SkNoncopyable.h"
+#include "include/private/SkNoncopyable.h"
 #include "modules/skcms/skcms.h"
 
 // TODO(kjlubick, bungeman) Replace these includes with forward declares

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkBmpRustDecoder_DEFINED
+#define SkBmpRustDecoder_DEFINED
+
+#include "include/codec/SkCodec.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/SkAPI.h"
+
+class SkData;
+class SkStream;
+
+#include <memory>
+
+namespace SkBmpRustDecoder {
+
+/** Returns true if this data claims to be a BMP image. */
+SK_API bool IsBmp(const void*, size_t);
+
+/**
+ *  Attempts to decode the given bytes as a BMP using Rust implementation.
+ *
+ *  If the bytes are not a BMP, returns nullptr.
+ */
+SK_API std::unique_ptr<SkCodec> Decode(std::unique_ptr<SkStream>,
+                                       SkCodec::Result*,
+                                       SkCodecs::DecodeContext = nullptr);
+SK_API std::unique_ptr<SkCodec> Decode(sk_sp<const SkData>,
+                                       SkCodec::Result*,
+                                       SkCodecs::DecodeContext = nullptr);
+
+inline constexpr SkCodecs::Decoder Decoder() {
+    return { "rust_bmp", IsBmp, Decode };
+}
+
+}  // namespace SkBmpRustDecoder
+
+#endif  // SkBmpRustDecoder_DEFINED

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

@@ -19,7 +19,7 @@
 #include "include/core/SkYUVAPixmaps.h"
 #include "include/private/SkEncodedInfo.h"
 #include "include/private/SkHdrMetadata.h"
-#include "include/private/base/SkNoncopyable.h"
+#include "include/private/SkNoncopyable.h"
 #include "modules/skcms/skcms.h"
 
 #include <cstddef>
@@ -1129,7 +1129,8 @@ private:
     friend class PNGCodecGM;    // for fillIncompleteImage
     friend class SkSampledCodec;
     friend class SkIcoCodec;
-    friend class SkPngCodec;     // for onGetGainmapCodec
+    friend class SkIcoRustCodec;  // for getEncodedInfo and getSampler
+    friend class SkPngCodecBase;  // for onGetGainmapCodec
     friend class SkAndroidCodec;  // for handleFrameIndex
     friend class SkCodecPriv;     // for fEncodedInfo
 };

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -10,7 +10,7 @@
 
 #include "include/codec/SkEncodedOrigin.h"
 #include "include/core/SkImageInfo.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkPixmap;
 

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -10,7 +10,7 @@
 #include <memory>
 
 #include "include/codec/SkCodec.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkStream;
 

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -9,7 +9,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 class SkData;
 class SkStream;

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

@@ -18,8 +18,8 @@
 #include "include/core/SkSamplingOptions.h"
 #include "include/core/SkSize.h"
 #include "include/core/SkTypes.h"
-#include "include/private/base/SkCPUTypes.h"
-#include "include/private/base/SkDebug.h"
+#include "include/private/SkCPUTypes.h"
+#include "include/private/SkDebug.h"
 
 #include <cstddef>
 #include <cstdint>
@@ -205,7 +205,7 @@ public:
 
         @return  true if dimensions do not enclose area
     */
-    bool empty() const { return fPixmap.info().isEmpty(); }
+    bool empty() const { return fPixmap.isEmpty(); }
 
     /** Returns true if SkPixelRef is nullptr.
 

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

@@ -7,7 +7,7 @@
 #ifndef skcpu_Context_DEFINED
 #define skcpu_Context_DEFINED
 
-#include "include/private/base/SkAPI.h"
+#include "include/private/SkAPI.h"
 
 #include <memory>
 

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

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