Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Remove the type parameter from SkObjectFinalizationRegistry. #21061

Merged
merged 1 commit into from
Sep 10, 2020
Merged

Remove the type parameter from SkObjectFinalizationRegistry. #21061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1640,7 +1640,7 @@ class TypefaceFontProviderNamespace {
Timer? _skObjectCollector;
List<SkDeletable> _skObjectDeleteQueue = <SkDeletable>[];

final SkObjectFinalizationRegistry<SkDeletable> skObjectFinalizationRegistry = SkObjectFinalizationRegistry<SkDeletable>(js.allowInterop((SkDeletable deletable) {
final SkObjectFinalizationRegistry skObjectFinalizationRegistry = SkObjectFinalizationRegistry(js.allowInterop((SkDeletable deletable) {
_skObjectDeleteQueue.add(deletable);
_skObjectCollector ??= _scheduleSkObjectCollection();
}));
Expand Down Expand Up @@ -1673,8 +1673,6 @@ Timer _scheduleSkObjectCollection() => Timer(Duration.zero, () {
html.window.performance.measure('SkObject collection', 'SkObject collection-start', 'SkObject collection-end');
});

typedef SkObjectFinalizer<T> = void Function(T key);

/// Any Skia object that has a `delete` method.
@JS()
@anonymous
Expand All @@ -1698,8 +1696,10 @@ class SkDeletable {
/// 5. The finalizer function is called with the SkPaint as the sole argument.
/// 6. We call `delete` on SkPaint.
@JS('window.FinalizationRegistry')
class SkObjectFinalizationRegistry<T> {
external SkObjectFinalizationRegistry(SkObjectFinalizer<T> finalizer);
class SkObjectFinalizationRegistry {
// TODO(hterkelsen): Add a type for the `cleanup` function when
// native constructors support type parameters.
external SkObjectFinalizationRegistry(Function cleanup);
external void register(Object ckObject, Object skObject);
}

Expand Down
5 changes: 2 additions & 3 deletions lib/web_ui/lib/src/engine/canvaskit/skia_object_cache.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,8 @@ class SkiaObjectBox {
bool _isDeleted = false;

/// Deletes Skia objects when their wrappers are garbage collected.
static final SkObjectFinalizationRegistry<SkiaObjectBox> boxRegistry =
SkObjectFinalizationRegistry<SkiaObjectBox>(
js.allowInterop((SkiaObjectBox box) {
static final SkObjectFinalizationRegistry boxRegistry =
SkObjectFinalizationRegistry(js.allowInterop((SkiaObjectBox box) {
box.delete();
}));

Expand Down