@shopify/react-native-skia 0.1.196 → 0.1.199

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

@@ -5,94 +5,11 @@
  * found in the LICENSE file.
  */
 
-#ifndef SkDeferredDisplayListRecorder_DEFINED
-#define SkDeferredDisplayListRecorder_DEFINED
-
-#include "include/core/SkDeferredDisplayList.h"
-#include "include/core/SkImage.h"
-#include "include/core/SkImageInfo.h"
-#include "include/core/SkRefCnt.h"
-#include "include/core/SkSurfaceCharacterization.h"
-#include "include/core/SkTypes.h"
-
-class GrBackendFormat;
-class GrBackendTexture;
-class GrRecordingContext;
-class GrYUVABackendTextureInfo;
-class SkCanvas;
-class SkSurface;
-
-/*
- * This class is intended to be used as:
- *   Get an SkSurfaceCharacterization representing the intended gpu-backed destination SkSurface
- *   Create one of these (an SkDeferredDisplayListRecorder) on the stack
- *   Get the canvas and render into it
- *   Snap off and hold on to an SkDeferredDisplayList
- *   Once your app actually needs the pixels, call SkSurface::draw(SkDeferredDisplayList*)
- *
- * This class never accesses the GPU but performs all the cpu work it can. It
- * is thread-safe (i.e., one can break a scene into tiles and perform their cpu-side
- * work in parallel ahead of time).
- */
-class SK_API SkDeferredDisplayListRecorder {
-public:
-    SkDeferredDisplayListRecorder(const SkSurfaceCharacterization&);
-    ~SkDeferredDisplayListRecorder();
-
-    const SkSurfaceCharacterization& characterization() const {
-        return fCharacterization;
-    }
-
-    // The backing canvas will become invalid (and this entry point will return
-    // null) once 'detach' is called.
-    // Note: ownership of the SkCanvas is not transferred via this call.
-    SkCanvas* getCanvas();
-
-    sk_sp<SkDeferredDisplayList> detach();
-
-#if defined(SK_GANESH)
-    using PromiseImageTextureContext = void*;
-    using PromiseImageTextureFulfillProc =
-            sk_sp<SkPromiseImageTexture> (*)(PromiseImageTextureContext);
-    using PromiseImageTextureReleaseProc = void (*)(PromiseImageTextureContext);
-
-#ifndef SK_MAKE_PROMISE_TEXTURE_DISABLE_LEGACY_API
-    /** Deprecated: Use SkImages::PromiseTextureFrom instead. */
-    sk_sp<SkImage> makePromiseTexture(const GrBackendFormat& backendFormat,
-                                      int width,
-                                      int height,
-                                      GrMipmapped mipmapped,
-                                      GrSurfaceOrigin origin,
-                                      SkColorType colorType,
-                                      SkAlphaType alphaType,
-                                      sk_sp<SkColorSpace> colorSpace,
-                                      PromiseImageTextureFulfillProc textureFulfillProc,
-                                      PromiseImageTextureReleaseProc textureReleaseProc,
-                                      PromiseImageTextureContext textureContext);
-
-    /** Deprecated: Use SkImages::PromiseTextureFromYUVA instead. */
-    sk_sp<SkImage> makeYUVAPromiseTexture(const GrYUVABackendTextureInfo& yuvaBackendTextureInfo,
-                                          sk_sp<SkColorSpace> imageColorSpace,
-                                          PromiseImageTextureFulfillProc textureFulfillProc,
-                                          PromiseImageTextureReleaseProc textureReleaseProc,
-                                          PromiseImageTextureContext textureContexts[]);
-#endif // SK_MAKE_PROMISE_TEXTURE_DISABLE_LEGACY_API
-#endif // defined(SK_GANESH)
-
-private:
-    SkDeferredDisplayListRecorder(const SkDeferredDisplayListRecorder&) = delete;
-    SkDeferredDisplayListRecorder& operator=(const SkDeferredDisplayListRecorder&) = delete;
-
-    bool init();
-
-    const SkSurfaceCharacterization             fCharacterization;
-
-#if defined(SK_GANESH)
-    sk_sp<GrRecordingContext>                   fContext;
-    sk_sp<GrRenderTargetProxy>                  fTargetProxy;
-    sk_sp<SkDeferredDisplayList::LazyProxyData> fLazyProxyData;
-    sk_sp<SkSurface>                            fSurface;
-#endif
-};
-
-#endif
+// TODO(kjlubick, robertphillips) migrate Chromium to use the new location
+#include "include/private/chromium/GrDeferredDisplayListRecorder.h" // IWYU pragma: export
+
+class GrDeferredDisplayList;
+class GrSurfaceCharacterization;
+using SkDeferredDisplayList = GrDeferredDisplayList;
+using SkDeferredDisplayListRecorder = GrDeferredDisplayListRecorder;
+using SkSurfaceCharacterization = GrSurfaceCharacterization;

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

@@ -93,7 +93,10 @@ public:
         return this->onSnapGpuDrawHandler(backendApi, matrix, clipBounds, bufferInfo);
     }
 
-    SkPicture* newPictureSnapshot();
+    /**
+     * Returns an SkPicture with the contents of this SkDrawable.
+     */
+    sk_sp<SkPicture> makePictureSnapshot();
 
     /**
      *  Return a unique value for this instance. If two calls to this return the same value,
@@ -166,7 +169,7 @@ protected:
      *  of their drawable. Note: this picture must draw the same as what would be drawn from
      *  onDraw().
      */
-    virtual SkPicture* onNewPictureSnapshot();
+    virtual sk_sp<SkPicture> onMakePictureSnapshot();
 
 private:
     int32_t fGenerationID;

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

@@ -74,6 +74,13 @@ public:
      */
     static void PurgeFontCache();
 
+    /**
+     *  If the strike cache is above the cache limit, attempt to purge strikes
+     *  with pinners. This should be called after clients release locks on
+     *  pinned strikes.
+     */
+    static void PurgePinnedFontCache();
+
     /**
      *  This function returns the memory used for temporary images and other resources.
      */
@@ -147,25 +154,6 @@ public:
      *  Call early in main() to allow Skia to use a JIT to accelerate CPU-bound operations.
      */
     static void AllowJIT();
-
-    /**
-     *  To override the default AA algorithm choice in the CPU backend, provide a function that
-     *  returns whether to use analytic (true) or supersampled (false) for a given path.
-     *
-     *  NOTE: This is a temporary API, intended for migration of all clients to one algorithm,
-     *        and should not be used.
-     */
-    typedef bool (*PathAnalyticAADeciderProc)(const SkPath&);
-    static void SetPathAnalyticAADecider(PathAnalyticAADeciderProc);
-
-    /*
-     *  Similar to above, but simply forces the CPU backend to always use analytic AA.
-     *
-     *  NOTE: This is a temporary API, intended for migration of all clients to one algorithm.
-     *        If the PathAnalyticAADeciderProc is *also* set, this setting has no effect.
-     *        Unlike that API, this function is thread-safe.
-     */
-    static void SetForceAnalyticAA(bool);
 };
 
 class SkAutoGraphics {