Roll engine after dart roll (#12473)
* Roll engine
* Move assert requiring 'this' from initializer to constructor body
* Update test expected message
* Relax regexp to allow wider array of dart uris
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
index 94a5f30..2ea392a 100644
--- a/bin/internal/engine.version
+++ b/bin/internal/engine.version
@@ -1 +1 @@
-459f722b86415da01386fe41f37bafa842f11ae8
+74e58f66d492a28a2c47ac5402d0b8b8a740cf62
diff --git a/packages/flutter/lib/src/cupertino/route.dart b/packages/flutter/lib/src/cupertino/route.dart
index 46355ad..a2a9b3a 100644
--- a/packages/flutter/lib/src/cupertino/route.dart
+++ b/packages/flutter/lib/src/cupertino/route.dart
@@ -88,8 +88,9 @@
assert(settings != null),
assert(maintainState != null),
assert(fullscreenDialog != null),
- assert(opaque), // PageRoute makes it return true.
- super(settings: settings, fullscreenDialog: fullscreenDialog);
+ super(settings: settings, fullscreenDialog: fullscreenDialog) {
+ assert(opaque); // PageRoute makes it return true.
+ }
/// Builds the primary contents of the route.
final WidgetBuilder builder;
diff --git a/packages/flutter/lib/src/foundation/assertions.dart b/packages/flutter/lib/src/foundation/assertions.dart
index 80c28d1..02c164a 100644
--- a/packages/flutter/lib/src/foundation/assertions.dart
+++ b/packages/flutter/lib/src/foundation/assertions.dart
@@ -329,7 +329,7 @@
'_FakeAsync',
'_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 List<String> result = <String>[];
final List<String> skipped = <String>[];
diff --git a/packages/flutter/lib/src/material/page.dart b/packages/flutter/lib/src/material/page.dart
index 967277d..a400175 100644
--- a/packages/flutter/lib/src/material/page.dart
+++ b/packages/flutter/lib/src/material/page.dart
@@ -70,8 +70,9 @@
this.maintainState: true,
bool fullscreenDialog: false,
}) : assert(builder != null),
- assert(opaque),
- super(settings: settings, fullscreenDialog: fullscreenDialog);
+ super(settings: settings, fullscreenDialog: fullscreenDialog) {
+ assert(opaque);
+ }
/// Builds the primary contents of the route.
final WidgetBuilder builder;
diff --git a/packages/flutter/lib/src/widgets/pages.dart b/packages/flutter/lib/src/widgets/pages.dart
index 6923837..026d6d0 100644
--- a/packages/flutter/lib/src/widgets/pages.dart
+++ b/packages/flutter/lib/src/widgets/pages.dart
@@ -81,10 +81,11 @@
this.maintainState: true,
}) : assert(pageBuilder != null),
assert(transitionsBuilder != null),
- assert(opaque != null),
assert(barrierDismissible != null),
assert(maintainState != null),
- super(settings: settings);
+ super(settings: settings) {
+ assert(opaque != null);
+ }
/// Used build the route's primary contents.
///
