DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove the type parameter from SkObjectFinalizationRegistry. (flutter/engine#21061)

Browse Source
This commit is contained in:
Harry Terkelsen 2020-09-09 17:20:02 -07:00 committed by GitHub
parent dda761af69
commit 21c8ce0b47
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
View File

@ -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();
}));
@ -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
@ -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);
}

5
engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/skia_object_cache.dart
View File

@ -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();
}));