| Index: sdk/lib/async/async_error.dart
|
| diff --git a/sdk/lib/async/async_error.dart b/sdk/lib/async/async_error.dart
|
| index cfb2beeab7d4ecdde4a0ab2edf2c8da746f0df81..e575b4152c3b4ba9c29d926937c06c9b32bfc8a2 100644
|
| --- a/sdk/lib/async/async_error.dart
|
| +++ b/sdk/lib/async/async_error.dart
|
| @@ -16,32 +16,10 @@ _invokeErrorHandler(
|
|
|
| Function _registerErrorHandler<R>(Function errorHandler, Zone zone) {
|
| if (errorHandler is ZoneBinaryCallback) {
|
| - return zone.registerBinaryCallback<R, dynamic, StackTrace>(
|
| - errorHandler as dynamic/*=ZoneBinaryCallback<R, dynamic, StackTrace>*/);
|
| + return zone.registerBinaryCallback<R, Object, StackTrace>(
|
| + errorHandler as dynamic/*=ZoneBinaryCallback<R, Object, StackTrace>*/);
|
| } else {
|
| - return zone.registerUnaryCallback<R, dynamic>(
|
| - errorHandler as dynamic/*=ZoneUnaryCallback<R, dynamic>*/);
|
| - }
|
| -}
|
| -
|
| -class _UncaughtAsyncError extends AsyncError {
|
| - _UncaughtAsyncError(error, StackTrace stackTrace)
|
| - : super(error, _getBestStackTrace(error, stackTrace));
|
| -
|
| - static StackTrace _getBestStackTrace(error, StackTrace stackTrace) {
|
| - if (stackTrace != null) return stackTrace;
|
| - if (error is Error) {
|
| - return error.stackTrace;
|
| - }
|
| - return null;
|
| - }
|
| -
|
| - String toString() {
|
| - String result = "Uncaught Error: ${error}";
|
| -
|
| - if (stackTrace != null) {
|
| - result += "\nStack Trace:\n$stackTrace";
|
| - }
|
| - return result;
|
| + return zone.registerUnaryCallback<R, Object>(
|
| + errorHandler as dynamic/*=ZoneUnaryCallback<R, Object>*/);
|
| }
|
| }
|
|
|