From e7061698147e80fa53ec3ed0cf048f4d68df7d68 Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Tue, 10 Oct 2017 06:38:51 -0700
Subject: [PATCH] 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
---
 bin/internal/engine.version                         | 2 +-
 packages/flutter/lib/src/cupertino/route.dart       | 5 +++--
 packages/flutter/lib/src/foundation/assertions.dart | 2 +-
 packages/flutter/lib/src/material/page.dart         | 5 +++--
 packages/flutter/lib/src/widgets/pages.dart         | 5 +++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/bin/internal/engine.version b/bin/internal/engine.version
index 94a5f3065cc..2ea392a2aec 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 46355adae01..a2a9b3a067e 100644
--- a/packages/flutter/lib/src/cupertino/route.dart
+++ b/packages/flutter/lib/src/cupertino/route.dart
@@ -88,8 +88,9 @@ class CupertinoPageRoute<T> extends PageRoute<T> {
        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 80c28d11dfe..02c164a95ff 100644
--- a/packages/flutter/lib/src/foundation/assertions.dart
+++ b/packages/flutter/lib/src/foundation/assertions.dart
@@ -329,7 +329,7 @@ class FlutterError extends AssertionError {
       '_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 967277d2f75..a400175c4dc 100644
--- a/packages/flutter/lib/src/material/page.dart
+++ b/packages/flutter/lib/src/material/page.dart
@@ -70,8 +70,9 @@ class MaterialPageRoute<T> extends PageRoute<T> {
     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 69238379dc1..026d6d03510 100644
--- a/packages/flutter/lib/src/widgets/pages.dart
+++ b/packages/flutter/lib/src/widgets/pages.dart
@@ -81,10 +81,11 @@ class PageRouteBuilder<T> extends PageRoute<T> {
     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.
   ///