Skip to content

Commit

Permalink
Revert dart rolls (flutter#7913)
Browse files Browse the repository at this point in the history
* Roll back three Dart SDK rolls

Revert "Roll src/third_party/dart 75ee523..4cff5a4 (6 commits)"
Revert "Roll src/third_party/dart 5ddd157..75ee523 (19 commits)"
Revert "Roll src/third_party/dart c92d5ca..5ddd157 (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 (61fc178)
and the following roll.

This reverts commit 0053c1d.
This reverts commit 1cf6b8b.
This reverts commit 61fc178.

* Revert "Revert "Revert "Remove unnecessary entry-point closurization. (flutter#7827)" (flutter#7876)" (flutter#7904)"

This reverts commit 93eeb48.
  • Loading branch information
cbracken authored Feb 22, 2019
1 parent 3f0ce76 commit 5db4b37
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 23 deletions.
6 changes: 3 additions & 3 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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',
Expand Down
5 changes: 1 addition & 4 deletions ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 049b7971585ead7ab4f23b8bdf29853f
Signature: a76c88a9ff389b1401e9df71fb13c1f6

UNUSED LICENSES:

Expand Down Expand Up @@ -5707,8 +5707,6 @@ FILE: ../../../third_party/dart/runtime/lib/ffi_dynamic_library.cc
FILE: ../../../third_party/dart/runtime/lib/ffi_dynamic_library_patch.dart
FILE: ../../../third_party/dart/runtime/lib/ffi_native_type_patch.dart
FILE: ../../../third_party/dart/runtime/lib/ffi_patch.dart
FILE: ../../../third_party/dart/runtime/tools/graphexplorer/graphexplorer.html
FILE: ../../../third_party/dart/runtime/tools/graphexplorer/graphexplorer.js
FILE: ../../../third_party/dart/runtime/vm/class_id.h
FILE: ../../../third_party/dart/runtime/vm/code_entry_kind.h
FILE: ../../../third_party/dart/runtime/vm/compiler/asm_intrinsifier.cc
Expand Down Expand Up @@ -5753,7 +5751,6 @@ FILE: ../../../third_party/dart/runtime/vm/type_testing_stubs_arm.cc
FILE: ../../../third_party/dart/runtime/vm/type_testing_stubs_arm64.cc
FILE: ../../../third_party/dart/runtime/vm/type_testing_stubs_x64.cc
FILE: ../../../third_party/dart/samples/ffi/coordinate.dart
FILE: ../../../third_party/dart/samples/ffi/dylib_utils.dart
FILE: ../../../third_party/dart/samples/ffi/sample_ffi_data.dart
FILE: ../../../third_party/dart/samples/ffi/sample_ffi_dynamic_library.dart
FILE: ../../../third_party/dart/samples/ffi/sample_ffi_functions.dart
Expand Down
2 changes: 1 addition & 1 deletion lib/stub_ui/natives.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Future<developer.ServiceExtensionResponse> _scheduleFrame(
}));
}

@pragma('vm:entry-point', 'call')
@pragma('vm:entry-point')
void _setupHooks() { // ignore: unused_element
assert(() {
// In debug mode, register the schedule frame extension.
Expand Down
24 changes: 12 additions & 12 deletions lib/ui/hooks.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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<String> locales) {
const int stringsPerLocale = 4;
Expand All @@ -77,7 +77,7 @@ void _updateLocales(List<String> locales) {
_invoke(window.onLocaleChanged, window._onLocaleChangedZone);
}

@pragma('vm:entry-point', 'call')
@pragma('vm:entry-point')
// ignore: unused_element
void _updateUserSettingsData(String jsonData) {
final Map<String, dynamic> data = json.decode(jsonData);
Expand All @@ -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);
Expand All @@ -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<String, ByteData, PlatformMessageResponseCallback>(
Expand All @@ -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<PointerDataPacket>(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<int, SemanticsAction, ByteData>(
Expand All @@ -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<Duration>(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);
Expand All @@ -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((){
Expand Down
6 changes: 3 additions & 3 deletions lib/ui/natives.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Future<developer.ServiceExtensionResponse> _scheduleFrame(
}));
}

@pragma('vm:entry-point', 'call')
@pragma('vm:entry-point')
void _setupHooks() { // ignore: unused_element
assert(() {
// In debug mode, register the schedule frame extension.
Expand Down Expand Up @@ -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

0 comments on commit 5db4b37

Please sign in to comment.