Index: sdk/lib/html/dartium/html_dartium.dart |
diff --git a/sdk/lib/html/dartium/html_dartium.dart b/sdk/lib/html/dartium/html_dartium.dart |
index 63d115219c51e157c52002ba2f553273abe571c4..95c43f64b33d9239ec51225fad5095bae41037c2 100644 |
--- a/sdk/lib/html/dartium/html_dartium.dart |
+++ b/sdk/lib/html/dartium/html_dartium.dart |
@@ -20231,7 +20231,7 @@ class HtmlDocument extends Document { |
// Get the created constructor source and look at the initializer; |
// Must call super.created() if not its as an error. |
- var createdSource = methodMirror.source.replaceAll('\n', ' '); |
+ var createdSource = methodMirror.source?.replaceAll('\n', ' '); |
RegExp regExp = new RegExp(r":(.*?)(;|}|\n)"); |
var match = regExp.firstMatch(createdSource); |
superCreatedCalled = match.input.substring(match.start,match.end).contains("super.created("); |
@@ -20244,6 +20244,10 @@ class HtmlDocument extends Document { |
} |
classMirror = classMirror.superclass; |
+ while (classMirror != classMirror.mixin) { |
+ // Skip the mixins. |
+ classMirror = classMirror.superclass; |
+ } |
} |
return true; |