Index: sdk/lib/_internal/compiler/implementation/js_backend/native_emitter.dart |
diff --git a/sdk/lib/_internal/compiler/implementation/js_backend/native_emitter.dart b/sdk/lib/_internal/compiler/implementation/js_backend/native_emitter.dart |
index d8407c386f6d6b60210fe363fb9653a00e5c5eee..0bc0bc8eabb95d76cc22608746329d5f1706391d 100644 |
--- a/sdk/lib/_internal/compiler/implementation/js_backend/native_emitter.dart |
+++ b/sdk/lib/_internal/compiler/implementation/js_backend/native_emitter.dart |
@@ -161,7 +161,7 @@ function(cls, desc) { |
compiler.findHelper(const SourceString('convertDartClosureToJS')); |
String closureConverter = backend.namer.isolateAccess(converter); |
Set<String> stubParameterNames = new Set<String>.from( |
- stubParameters.map((param) => param.name)); |
+ stubParameters.mappedBy((param) => param.name)); |
parameters.forEachParameter((Element parameter) { |
String name = parameter.name.slowToString(); |
// If [name] is not in [stubParameters], then the parameter is an optional |
@@ -255,7 +255,7 @@ function(cls, desc) { |
js.use('Object').dot('prototype').dot(methodName).dot('call') |
.callWith( |
<js.Expression>[js.use('this')]..addAll( |
- parameters.map((param) => js.use(param.name)))))); |
+ parameters.mappedBy((param) => js.use(param.name)))))); |
} |
js.Block generateMethodBodyWithPrototypeCheckForElement( |
@@ -298,14 +298,14 @@ function(cls, desc) { |
} |
classesWithDynamicDispatch.forEach(visit); |
- Collection<ClassElement> preorderDispatchClasses = classes.filter( |
+ List<ClassElement> preorderDispatchClasses = classes.where( |
(cls) => !getDirectSubclasses(cls).isEmpty && |
- classesWithDynamicDispatch.contains(cls)); |
+ classesWithDynamicDispatch.contains(cls)).toList(); |
if (!compiler.enableMinification) { |
nativeBuffer.add('// ${classes.length} classes\n'); |
} |
- Collection<ClassElement> classesThatHaveSubclasses = classes.filter( |
+ Iterable<ClassElement> classesThatHaveSubclasses = classes.where( |
(ClassElement t) => !getDirectSubclasses(t).isEmpty); |
if (!compiler.enableMinification) { |
nativeBuffer.add('// ${classesThatHaveSubclasses.length} !leaf\n'); |
@@ -411,7 +411,7 @@ function(cls, desc) { |
// [['Node', 'Text|HTMLElement|HTMLDivElement|...'], ...] |
js.Expression table = |
new js.ArrayInitializer.from( |
- preorderDispatchClasses.map((cls) => |
+ preorderDispatchClasses.mappedBy((cls) => |
new js.ArrayInitializer.from([ |
js.string(toNativeTag(cls)), |
tagDefns[cls]]))); |