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

Side by Side Diff: tool/input_sdk/lib/async/async_error.dart

Issue 1953153002: Update dart:async to match the Dart repo. (Closed) Base URL: https://github.com/dart-lang/dev_compiler.git@master
Patch Set: Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 part of dart.async; 5 part of dart.async;
6 6
7 _invokeErrorHandler(Function errorHandler, 7 _invokeErrorHandler(Function errorHandler,
8 Object error, StackTrace stackTrace) { 8 Object error, StackTrace stackTrace) {
9 if (errorHandler is ZoneBinaryCallback) { 9 if (errorHandler is ZoneBinaryCallback) {
10 return errorHandler(error, stackTrace); 10 return errorHandler(error, stackTrace);
11 } else { 11 } else {
12 return errorHandler(error); 12 ZoneUnaryCallback unaryErrorHandler = errorHandler;
13 return unaryErrorHandler(error);
13 } 14 }
14 } 15 }
15 16
16 Function _registerErrorHandler(Function errorHandler, Zone zone) { 17 Function _registerErrorHandler/*<R>*/(Function errorHandler, Zone zone) {
17 if (errorHandler is ZoneBinaryCallback) { 18 if (errorHandler is ZoneBinaryCallback) {
18 return zone.registerBinaryCallback(errorHandler); 19 return zone.registerBinaryCallback/*<R, dynamic, StackTrace>*/(
20 errorHandler as dynamic/*=ZoneBinaryCallback<R, dynamic, StackTrace>*/);
19 } else { 21 } else {
20 return zone.registerUnaryCallback(errorHandler); 22 return zone.registerUnaryCallback/*<R, dynamic>*/(
23 errorHandler as dynamic/*=ZoneUnaryCallback<R, dynamic>*/);
21 } 24 }
22 } 25 }
23 26
24 class _UncaughtAsyncError extends AsyncError { 27 class _UncaughtAsyncError extends AsyncError {
25 _UncaughtAsyncError(error, StackTrace stackTrace) 28 _UncaughtAsyncError(error, StackTrace stackTrace)
26 : super(error, _getBestStackTrace(error, stackTrace)); 29 : super(error, _getBestStackTrace(error, stackTrace));
27 30
28 static StackTrace _getBestStackTrace(error, StackTrace stackTrace) { 31 static StackTrace _getBestStackTrace(error, StackTrace stackTrace) {
29 if (stackTrace != null) return stackTrace; 32 if (stackTrace != null) return stackTrace;
30 if (error is Error) { 33 if (error is Error) {
31 return error.stackTrace; 34 return error.stackTrace;
32 } 35 }
33 return null; 36 return null;
34 } 37 }
35 38
36 String toString() { 39 String toString() {
37 String result = "Uncaught Error: ${error}"; 40 String result = "Uncaught Error: ${error}";
38 41
39 if (stackTrace != null) { 42 if (stackTrace != null) {
40 result += "\nStack Trace:\n$stackTrace"; 43 result += "\nStack Trace:\n$stackTrace";
41 } 44 }
42 return result; 45 return result;
43 } 46 }
44 } 47 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698