Index: tools/dom/src/shared_html.dart |
diff --git a/tools/dom/src/shared_html.dart b/tools/dom/src/shared_html.dart |
index edeaaed86b265303a6e3e064b67df6910c9cf5fc..1120a6e5a3f9b7dc0f3440596c6bb9c3db7d6c62 100644 |
--- a/tools/dom/src/shared_html.dart |
+++ b/tools/dom/src/shared_html.dart |
@@ -4,18 +4,24 @@ |
part of dart.dom.html; |
-void Function(T) _wrapZone<T>(void Function(T) callback) { |
+// TODO(jacobr): remove these typedefs when dart:async supports generic types. |
+typedef R _wrapZoneCallback<A, R>(A a); |
+typedef R _wrapZoneBinaryCallback<A, B, R>(A a, B b); |
+ |
+_wrapZoneCallback/*<A, R>*/ _wrapZone/*<A, R>*/( |
+ _wrapZoneCallback/*<A, R>*/ callback) { |
// For performance reasons avoid wrapping if we are in the root zone. |
if (Zone.current == Zone.ROOT) return callback; |
if (callback == null) return null; |
- return Zone.current.bindUnaryCallbackGuarded(callback); |
+ return Zone.current.bindUnaryCallback/*<R, A>*/(callback, runGuarded: true); |
} |
-void Function(T1, T2) _wrapBinaryZone<T1, T2>(void Function(T1, T2) callback) { |
- // For performance reasons avoid wrapping if we are in the root zone. |
+_wrapZoneBinaryCallback/*<A, B, R>*/ _wrapBinaryZone/*<A, B, R>*/( |
+ _wrapZoneBinaryCallback/*<A, B, R>*/ callback) { |
if (Zone.current == Zone.ROOT) return callback; |
if (callback == null) return null; |
- return Zone.current.bindBinaryCallbackGuarded(callback); |
+ return Zone.current |
+ .bindBinaryCallback/*<R, A, B>*/(callback, runGuarded: true); |
} |
/** |