OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 'use strict'; | 5 'use strict'; |
6 | 6 |
7 /** | 7 /** |
8 * This variable is checked in SelectFileDialogExtensionBrowserTest. | 8 * This variable is checked in SelectFileDialogExtensionBrowserTest. |
9 * @type {number} | 9 * @type {number} |
10 */ | 10 */ |
11 window.JSErrorCount = 0; | 11 window.JSErrorCount = 0; |
12 | 12 |
13 /** | 13 /** |
14 * Counts uncaught exceptions. | 14 * Counts uncaught exceptions. |
15 */ | 15 */ |
16 window.onerror = function() { window.JSErrorCount++; }; | 16 window.onerror = function() { window.JSErrorCount++; }; |
17 | 17 |
18 /** | 18 /** |
19 * Wraps the function to use it as a callback. | 19 * Wraps the function to use it as a callback. |
20 * This does: | 20 * This does: |
21 * - Capture the stack trace in case of error. | 21 * - Capture the stack trace in case of error. |
22 * - Bind this object | 22 * - Bind this object |
23 * | 23 * |
24 * @param {Object} thisObject Object to be used as this. | 24 * @param {Object} thisObject Object to be used as this. |
| 25 * @param {...} var_args Arguments to be bound with the wrapped function. |
25 * @return {function} Wrapped function. | 26 * @return {function} Wrapped function. |
26 */ | 27 */ |
27 Function.prototype.wrap = function(thisObject) { | 28 Function.prototype.wrap = function(thisObject, var_args) { |
28 var func = this; | 29 var func = this; |
29 var liveStack = (new Error('Stack trace before async call')).stack; | 30 var liveStack = (new Error('Stack trace before async call')).stack; |
30 if (thisObject === undefined) | 31 if (thisObject === undefined) |
31 thisObject = null; | 32 thisObject = null; |
| 33 var boundArguments = Array.prototype.slice.call(arguments, 1); |
32 | 34 |
33 return function wrappedCallback() { | 35 return function wrappedCallback(var_args) { |
34 try { | 36 try { |
35 return func.apply(thisObject, arguments); | 37 var args = boundArguments.concat(Array.prototype.slice.call(arguments)); |
| 38 return func.apply(thisObject, args); |
36 } catch (e) { | 39 } catch (e) { |
37 console.error('Exception happens in callback.', liveStack); | 40 // Some async funcrtion doesn't handle exception correctly. So outputing |
| 41 // the exception message and stack trace just in case. |
| 42 // The message will show twice if the caller handles exception correctly. |
| 43 console.error(e.stack); |
| 44 console.info('Exception above happened in callback.', liveStack); |
38 | 45 |
39 window.JSErrorCount++; | 46 window.JSErrorCount++; |
40 throw e; | 47 throw e; |
41 } | 48 } |
42 } | 49 } |
43 }; | 50 }; |
OLD | NEW |