Index: LayoutTests/fast/events/resources/onerror-test.js |
diff --git a/LayoutTests/fast/events/resources/onerror-test.js b/LayoutTests/fast/events/resources/onerror-test.js |
index 1016aa201081576947532187954f43b99b8fbb74..50beff3d23d37804c419f25f1c85c15ba639cd07 100644 |
--- a/LayoutTests/fast/events/resources/onerror-test.js |
+++ b/LayoutTests/fast/events/resources/onerror-test.js |
@@ -8,8 +8,10 @@ function throwException(message) { |
var errorsSeen = 0; |
function dumpOnErrorArgumentValuesAndReturn(returnValue, callback) { |
- window.onerror = function (message, url, line, column) { |
+ window.onerror = function (message, url, line, column, error) { |
debug("window.onerror: \"" + message + "\" at " + stripURL(url) + " (Line: " + line + ", Column: " + column + ")"); |
+ if (error) |
+ debug(stripStackURLs(error.stack)); |
if (callback) |
callback(++errorsSeen); |
@@ -44,6 +46,8 @@ var eventPassedToTheErrorListener = null; |
var eventCurrentTarget = null; |
function dumpErrorEvent(e) { |
debug("Handling '" + e.type + "' event (phase " + e.eventPhase + "): \"" + e.message + "\" at " + stripURL(e.filename) + ":" + e.lineno); |
+ if (e.error) |
+ debug(stripStackURLs(e.error.stack)); |
eventPassedToTheErrorListener = e; |
eventCurrentTarget = e.currentTarget; |
@@ -52,3 +56,13 @@ function dumpErrorEvent(e) { |
eventPassedToTheErrorListener = null; |
eventCurrentTarget = null; |
} |
+ |
+function stripStackURLs(stackTrace) { |
+ var text = stackTrace + "\n\n"; |
+ stackTrace = stackTrace.split("\n"); |
+ var length = Math.min(stackTrace.length, 100); |
+ for (var i = 0; i < length; i++) { |
+ text += stackTrace[i].replace(/at ((?:eval at \()?[a-zA-Z\.]+ )?\(?.+\/([^\/]+):(\d+):(\d+)\)?/, "at $1$2:$3:$4") + "\n"; |
+ } |
+ return text; |
+} |