clean up

flutter · Jan 9, 2020 · b3da205 · b3da205
1 parent e01c4cf
commit b3da205
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/lib/ui/text.dart b/lib/ui/text.dart
@@ -2123,14 +2123,16 @@ class ParagraphBuilder extends NativeFieldWrapperClass2 {
 Future<void> loadFontFromList(Uint8List list, {String fontFamily}) {
   return _futurize(
     (_Callback<void> callback) => _loadFontFromList(list, callback, fontFamily)
-  ).then((_) async {
-    if (window.onPlatformMessage != null)
-      window.onPlatformMessage(
-        'flutter/system',
-        utf8.encoder.convert(json.encode(<String, dynamic>{'type': 'fontsChange'})).buffer.asByteData(),
+  ).then(_sendFontChangeMessage);
+}
+
+FutureOr<void> _sendFontChangeMessage(void result) async {
+  if (window.onPlatformMessage != null)
+    window.onPlatformMessage(
+      'flutter/system',
+      utf8.encoder.convert(json.encode(<String, dynamic>{'type': 'fontsChange'})).buffer.asByteData(),
         (_) {},
-      );
-  });
+    );
 }
 
 String _loadFontFromList(Uint8List list, _Callback<void> callback, String fontFamily) native 'loadFontFromList';
diff --git a/lib/web_ui/lib/src/ui/text.dart b/lib/web_ui/lib/src/ui/text.dart
@@ -1490,12 +1490,14 @@ abstract class ParagraphBuilder {
 /// * `fontFamily`: The family name used to identify the font in text styles.
 ///  If this is not provided, then the family name will be extracted from the font file.
 Future<void> loadFontFromList(Uint8List list, {String fontFamily}) {
-  return _fontCollection.loadFontFromList(list, fontFamily: fontFamily).then((_) async {
-    if (window.onPlatformMessage != null)
-      window.onPlatformMessage(
-        'flutter/system',
-        engine.JSONMessageCodec().encodeMessage(<String, dynamic>{'type': 'fontsChange'}),
-        (_) {},
-      );
-  });;
+  return _fontCollection.loadFontFromList(list, fontFamily: fontFamily).then(_sendFontChangeMessage);
 }
+
+FutureOr<void> _sendFontChangeMessage(void result) async {
+  if (window.onPlatformMessage != null)
+    window.onPlatformMessage(
+      'flutter/system',
+      engine.JSONMessageCodec().encodeMessage(<String, dynamic>{'type': 'fontsChange'}),
+      (_) {},
+    );
+}