Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(563)

Unified Diff: lib/compiler/implementation/native_emitter.dart

Issue 10108012: Fix for issue 2468: also convert Dart closures to Js closures in stubs for native methods. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « frog/tests/native/src/NativeWrappingFunction3FrogTest.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/compiler/implementation/native_emitter.dart
===================================================================
--- lib/compiler/implementation/native_emitter.dart (revision 6617)
+++ lib/compiler/implementation/native_emitter.dart (working copy)
@@ -139,6 +139,21 @@
return result;
}
+ void potentiallyConvertDartClosuresToJs(StringBuffer code,
+ FunctionElement member) {
+ FunctionParameters parameters = member.computeParameters(compiler);
+ Element converter =
+ compiler.findHelper(const SourceString('convertDartClosureToJS'));
+ String closureConverter = compiler.namer.isolateAccess(converter);
+ parameters.forEachParameter((Element parameter) {
+ Type type = parameter.computeType(compiler);
+ if (type is FunctionType) {
+ String name = parameter.name.slowToString();
+ code.add(' $name = $closureConverter($name);\n');
+ }
+ });
+ }
+
void emitParameterStub(Element member,
String invocationName,
String stubParameters,
@@ -160,14 +175,18 @@
String nativeName = classElement.nativeName.slowToString();
String nativeArguments = Strings.join(nativeArgumentsBuffer, ",");
+ StringBuffer code = new StringBuffer();
+ potentiallyConvertDartClosuresToJs(code, member);
+
String name = member.name.slowToString();
- String code = ' return this.$name($nativeArguments);\n';
+ code.add(' return this.$name($nativeArguments);');
+
if (isNativeLiteral(nativeName) || !overriddenMethods.contains(member)) {
// Call the method directly.
- buffer.add(code);
+ buffer.add(code.toString());
} else {
native.generateMethodWithPrototypeCheck(
- compiler, buffer, invocationName, code, stubParameters);
+ compiler, buffer, invocationName, code.toString(), stubParameters);
}
}
« no previous file with comments | « frog/tests/native/src/NativeWrappingFunction3FrogTest.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698