Commit 7f5b973c authored by Alexander Aprelev's avatar Alexander Aprelev Committed by GitHub

Revert "Roll engine after dart roll (#12473)" (#12477)

This reverts commit e7061698.

This causes preview-dart-2 test failures.
parent e7061698
74e58f66d492a28a2c47ac5402d0b8b8a740cf62 459f722b86415da01386fe41f37bafa842f11ae8
...@@ -88,9 +88,8 @@ class CupertinoPageRoute<T> extends PageRoute<T> { ...@@ -88,9 +88,8 @@ class CupertinoPageRoute<T> extends PageRoute<T> {
assert(settings != null), assert(settings != null),
assert(maintainState != null), assert(maintainState != null),
assert(fullscreenDialog != null), assert(fullscreenDialog != null),
super(settings: settings, fullscreenDialog: fullscreenDialog) { assert(opaque), // PageRoute makes it return true.
assert(opaque); // PageRoute makes it return true. super(settings: settings, fullscreenDialog: fullscreenDialog);
}
/// Builds the primary contents of the route. /// Builds the primary contents of the route.
final WidgetBuilder builder; final WidgetBuilder builder;
......
...@@ -329,7 +329,7 @@ class FlutterError extends AssertionError { ...@@ -329,7 +329,7 @@ class FlutterError extends AssertionError {
'_FakeAsync', '_FakeAsync',
'_FrameCallbackEntry', '_FrameCallbackEntry',
]; ];
final RegExp stackParser = new RegExp(r'^#[0-9]+ +([^.]+).* \(([^/]*)/.+:[0-9]+(?::[0-9]+)?\)$'); final RegExp stackParser = new RegExp(r'^#[0-9]+ +([^.]+).* \(([^/]*)/[^:]+:[0-9]+(?::[0-9]+)?\)$');
final RegExp packageParser = new RegExp(r'^([^:]+):(.+)$'); final RegExp packageParser = new RegExp(r'^([^:]+):(.+)$');
final List<String> result = <String>[]; final List<String> result = <String>[];
final List<String> skipped = <String>[]; final List<String> skipped = <String>[];
......
...@@ -70,9 +70,8 @@ class MaterialPageRoute<T> extends PageRoute<T> { ...@@ -70,9 +70,8 @@ class MaterialPageRoute<T> extends PageRoute<T> {
this.maintainState: true, this.maintainState: true,
bool fullscreenDialog: false, bool fullscreenDialog: false,
}) : assert(builder != null), }) : assert(builder != null),
super(settings: settings, fullscreenDialog: fullscreenDialog) { assert(opaque),
assert(opaque); super(settings: settings, fullscreenDialog: fullscreenDialog);
}
/// Builds the primary contents of the route. /// Builds the primary contents of the route.
final WidgetBuilder builder; final WidgetBuilder builder;
......
...@@ -81,11 +81,10 @@ class PageRouteBuilder<T> extends PageRoute<T> { ...@@ -81,11 +81,10 @@ class PageRouteBuilder<T> extends PageRoute<T> {
this.maintainState: true, this.maintainState: true,
}) : assert(pageBuilder != null), }) : assert(pageBuilder != null),
assert(transitionsBuilder != null), assert(transitionsBuilder != null),
assert(opaque != null),
assert(barrierDismissible != null), assert(barrierDismissible != null),
assert(maintainState != null), assert(maintainState != null),
super(settings: settings) { super(settings: settings);
assert(opaque != null);
}
/// Used build the route's primary contents. /// Used build the route's primary contents.
/// ///
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment