Chromium Code Reviews| Index: tools/dom/src/shared_html.dart |
| diff --git a/tools/dom/src/shared_html.dart b/tools/dom/src/shared_html.dart |
| index 7342cdfef31238ae884a8abcffebc73faef68749..063ea20f739880b34c99e043099c2372d590770e 100644 |
| --- a/tools/dom/src/shared_html.dart |
| +++ b/tools/dom/src/shared_html.dart |
| @@ -4,31 +4,26 @@ |
| part of dart.dom.html; |
| -// 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); |
| +ZoneUnaryCallback/*<R, T>*/ _registerZone/*<R, T>*/(Zone zone, |
| + ZoneUnaryCallback/*<R, T>*/ callback) { |
| + // For performance reasons avoid registering if we are in the root zone. |
| + if (zone == Zone.ROOT) return callback; |
|
Lasse Reichstein Nielsen
2016/06/07 12:21:44
consider using `identical` for the test (or puttin
floitsch
2016/06/10 15:43:58
Done.
|
| + if (callback == null) return null; |
| + return zone.registerUnaryCallback(callback); |
| +} |
| -_wrapZoneCallback/*<A, R>*/ _wrapZone/*<A, R>*/(_wrapZoneCallback/*<A, R>*/ callback) { |
| +ZoneUnaryCallback/*<R, T>*/ _wrapZone/*<R, T>*/(ZoneUnaryCallback/*<R, T>*/ 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; |
| - // TODO(jacobr): we cast to _wrapZoneCallback/*<A, R>*/ to hack around missing |
| - // generic method support in zones. |
| - // ignore: STRONG_MODE_DOWN_CAST_COMPOSITE |
| - _wrapZoneCallback/*<A, R>*/ wrapped = |
| - Zone.current.bindUnaryCallback(callback, runGuarded: true); |
| - return wrapped; |
| + return Zone.current.bindUnaryCallback(callback, runGuarded: true); |
| } |
| -_wrapZoneBinaryCallback/*<A, B, R>*/ _wrapBinaryZone/*<A, B, R>*/(_wrapZoneBinaryCallback/*<A, B, R>*/ callback) { |
| +ZoneBinaryCallback/*<R, A, B>*/ _wrapBinaryZone/*<R, A, B>*/( |
| + ZoneBinaryCallback/*<R, A, B>*/ callback) { |
| if (Zone.current == Zone.ROOT) return callback; |
| if (callback == null) return null; |
| - // We cast to _wrapZoneBinaryCallback/*<A, B, R>*/ to hack around missing |
| - // generic method support in zones. |
| - // ignore: STRONG_MODE_DOWN_CAST_COMPOSITE |
| - _wrapZoneBinaryCallback/*<A, B, R>*/ wrapped = |
| - Zone.current.bindBinaryCallback(callback, runGuarded: true); |
| - return wrapped; |
| + return Zone.current.bindBinaryCallback(callback, runGuarded: true); |
| } |
| /** |