From 63b7d5be9d9253708076da42a1f0cccef0d0ccda Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Thu, 21 Feb 2019 16:53:20 -0800 Subject: [PATCH] Revert dart rolls (flutter/engine#7913) * Roll back three Dart SDK rolls Revert "Roll src/third_party/dart 75ee523f91..4cff5a4fd6 (6 commits)" Revert "Roll src/third_party/dart 5ddd157809..75ee523f91 (19 commits)" Revert "Roll src/third_party/dart c92d5ca288..5ddd157809 (153 commits)" `pub upgrade` appears to fail 100% reproducibly on broken on Windows. This rollback rolls back both what appears to be the breaking roll (3054041) and the following roll. This reverts commit def753db2d3ef3535dbb943145e49d762a77277a. This reverts commit 78d8e3acc59bbabd229238c33586d7f9e6508963. This reverts commit 3054041500d4ec15be6c92c42c906e7e59cae725. * Revert "Revert "Revert "Remove unnecessary entry-point closurization. (#7827)" (#7876)" (#7904)" This reverts commit 8fe68c494007c9d25d7396f0e5952d2f921c6d25. --- DEPS | 6 +++--- engine/src/flutter/lib/ui/hooks.dart | 24 ++++++++++++------------ engine/src/flutter/lib/ui/natives.dart | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/DEPS b/DEPS index 968abdc462..cb6c2cec29 100644 --- a/DEPS +++ b/DEPS @@ -31,7 +31,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS. # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '4cff5a4fd6a02c5c4277a9087e6fb69052b120f9', + 'dart_revision': 'c92d5ca288da15b54b04c0a40ffe5d94a8883d77', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -47,9 +47,9 @@ vars = { 'dart_convert_tag': '2.0.2', 'dart_crypto_tag': '2.0.6', 'dart_csslib_tag': '0.14.4+1', - 'dart_dart2js_info_tag': '0.6.0', + 'dart_dart2js_info_tag': '0.5.15', 'dart_dart_style_tag': '1.2.2', - 'dart_dartdoc_tag': 'v0.28.2', + 'dart_dartdoc_tag': 'v0.28.1+2', 'dart_fixnum_tag': '0.10.9', 'dart_glob_tag': '1.1.7', 'dart_html_tag': '0.13.3+2', diff --git a/engine/src/flutter/lib/ui/hooks.dart b/engine/src/flutter/lib/ui/hooks.dart index 7386663ee5..b1550bf90b 100644 --- a/engine/src/flutter/lib/ui/hooks.dart +++ b/engine/src/flutter/lib/ui/hooks.dart @@ -16,7 +16,7 @@ dynamic _decodeJSON(String message) { return message != null ? json.decode(message) : null; } -@pragma('vm:entry-point', 'call') +@pragma('vm:entry-point') // ignore: unused_element void _updateWindowMetrics(double devicePixelRatio, double width, @@ -54,11 +54,11 @@ String _localeClosure() { return window.locale.toString(); } -@pragma('vm:entry-point', 'call') +@pragma('vm:entry-point') // ignore: unused_element _LocaleClosure _getLocaleClosure() => _localeClosure; -@pragma('vm:entry-point', 'call') +@pragma('vm:entry-point') // ignore: unused_element void _updateLocales(List locales) { const int stringsPerLocale = 4; @@ -77,7 +77,7 @@ void _updateLocales(List locales) { _invoke(window.onLocaleChanged, window._onLocaleChangedZone); } -@pragma('vm:entry-point', 'call') +@pragma('vm:entry-point') // ignore: unused_element void _updateUserSettingsData(String jsonData) { final Map data = json.decode(jsonData); @@ -103,14 +103,14 @@ void _updatePlatformBrightness(String brightnessName) { _invoke(window.onPlatformBrightnessChanged, window._onPlatformBrightnessChangedZone); } -@pragma('vm:entry-point', 'call') +@pragma('vm:entry-point') // ignore: unused_element void _updateSemanticsEnabled(bool enabled) { window._semanticsEnabled = enabled; _invoke(window.onSemanticsEnabledChanged, window._onSemanticsEnabledChangedZone); } -@pragma('vm:entry-point', 'call') +@pragma('vm:entry-point') // ignore: unused_element void _updateAccessibilityFeatures(int values) { final AccessibilityFeatures newFeatures = new AccessibilityFeatures._(values); @@ -120,7 +120,7 @@ void _updateAccessibilityFeatures(int values) { _invoke(window.onAccessibilityFeaturesChanged, window._onAccessibilityFlagsChangedZone); } -@pragma('vm:entry-point', 'call') +@pragma('vm:entry-point') void _dispatchPlatformMessage(String name, ByteData data, int responseId) { if (window.onPlatformMessage != null) { _invoke3( @@ -137,14 +137,14 @@ void _dispatchPlatformMessage(String name, ByteData data, int responseId) { } } -@pragma('vm:entry-point', 'call') +@pragma('vm:entry-point') // ignore: unused_element void _dispatchPointerDataPacket(ByteData packet) { if (window.onPointerDataPacket != null) _invoke1(window.onPointerDataPacket, window._onPointerDataPacketZone, _unpackPointerDataPacket(packet)); } -@pragma('vm:entry-point', 'call') +@pragma('vm:entry-point') // ignore: unused_element void _dispatchSemanticsAction(int id, int action, ByteData args) { _invoke3( @@ -156,13 +156,13 @@ void _dispatchSemanticsAction(int id, int action, ByteData args) { ); } -@pragma('vm:entry-point', 'call') +@pragma('vm:entry-point') // ignore: unused_element void _beginFrame(int microseconds) { _invoke1(window.onBeginFrame, window._onBeginFrameZone, new Duration(microseconds: microseconds)); } -@pragma('vm:entry-point', 'call') +@pragma('vm:entry-point') // ignore: unused_element void _drawFrame() { _invoke(window.onDrawFrame, window._onDrawFrameZone); @@ -173,7 +173,7 @@ typedef _UnaryFunction(Null args); // ignore: always_declare_return_types, prefer_generic_function_type_aliases typedef _BinaryFunction(Null args, Null message); -@pragma('vm:entry-point', 'call') +@pragma('vm:entry-point') // ignore: unused_element void _runMainZoned(Function startMainIsolateFunction, Function userMainFunction) { startMainIsolateFunction((){ diff --git a/engine/src/flutter/lib/ui/natives.dart b/engine/src/flutter/lib/ui/natives.dart index ed83b92e4f..1e9a0798f9 100644 --- a/engine/src/flutter/lib/ui/natives.dart +++ b/engine/src/flutter/lib/ui/natives.dart @@ -29,7 +29,7 @@ Future _scheduleFrame( })); } -@pragma('vm:entry-point', 'call') +@pragma('vm:entry-point') void _setupHooks() { // ignore: unused_element assert(() { // In debug mode, register the schedule frame extension. @@ -71,7 +71,7 @@ Function _getCallbackFromHandle(int handle) native 'GetCallbackFromHandle'; // Required for gen_snapshot to work correctly. int _isolateId; // ignore: unused_element -@pragma('vm:entry-point', 'call') +@pragma('vm:entry-point') Function _getPrintClosure() => _print; // ignore: unused_element -@pragma('vm:entry-point', 'call') +@pragma('vm:entry-point') Function _getScheduleMicrotaskClosure() => _scheduleMicrotask; // ignore: unused_element