| OLD | NEW |
| 1 var initialize_DebuggerTest = function() { | 1 var initialize_DebuggerTest = function() { |
| 2 | 2 |
| 3 InspectorTest.startDebuggerTest = function(callback, quiet) | 3 InspectorTest.startDebuggerTest = function(callback, quiet) |
| 4 { | 4 { |
| 5 if (quiet !== undefined) | 5 if (quiet !== undefined) |
| 6 InspectorTest._quiet = quiet; | 6 InspectorTest._quiet = quiet; |
| 7 WebInspector.showPanel("scripts"); | 7 WebInspector.showPanel("scripts"); |
| 8 | 8 |
| 9 if (WebInspector.debuggerModel.debuggerEnabled()) | 9 if (WebInspector.debuggerModel.debuggerEnabled()) |
| 10 startTest(); | 10 startTest(); |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 InspectorTest._waitUntilResumedCallback = callback; | 103 InspectorTest._waitUntilResumedCallback = callback; |
| 104 }; | 104 }; |
| 105 | 105 |
| 106 InspectorTest.resumeExecution = function(callback) | 106 InspectorTest.resumeExecution = function(callback) |
| 107 { | 107 { |
| 108 if (WebInspector.panels.scripts.paused) | 108 if (WebInspector.panels.scripts.paused) |
| 109 WebInspector.panels.scripts._togglePause(); | 109 WebInspector.panels.scripts._togglePause(); |
| 110 InspectorTest.waitUntilResumed(callback); | 110 InspectorTest.waitUntilResumed(callback); |
| 111 }; | 111 }; |
| 112 | 112 |
| 113 InspectorTest.captureStackTrace = function(callFrames, dropLineNumbers) | 113 // FIXME: upstream showColumnNumbers field perhaps upstreaming as |
| 114 // dropColumnNumbers instead. JavaScript and Dart both support column numbers |
| 115 // so upstreaming this change wis very reasonable. dartbug.com/13378 |
| 116 InspectorTest.captureStackTrace = function(callFrames, dropLineNumbers, showColu
mnNumbers) |
| 114 { | 117 { |
| 115 InspectorTest.addResult("Call stack:"); | 118 InspectorTest.addResult("Call stack:"); |
| 116 for (var i = 0; i < callFrames.length; i++) { | 119 for (var i = 0; i < callFrames.length; i++) { |
| 117 var frame = callFrames[i]; | 120 var frame = callFrames[i]; |
| 118 var script = WebInspector.debuggerModel.scriptForId(frame.location.scrip
tId); | 121 var script = WebInspector.debuggerModel.scriptForId(frame.location.scrip
tId); |
| 119 var url; | 122 var url; |
| 120 var lineNumber; | 123 var lineNumber; |
| 124 var columnNumber; |
| 121 if (script) { | 125 if (script) { |
| 122 url = WebInspector.displayNameForURL(script.sourceURL); | 126 url = WebInspector.displayNameForURL(script.sourceURL); |
| 123 lineNumber = frame.location.lineNumber + 1; | 127 lineNumber = frame.location.lineNumber + 1; |
| 128 columnNumber = frame.location.columnNumber + 1; |
| 124 } else { | 129 } else { |
| 125 url = "(internal script)"; | 130 url = "(internal script)"; |
| 126 lineNumber = "(line number)"; | 131 lineNumber = "(line number)"; |
| 132 columnNumber = "(column number)"; |
| 127 } | 133 } |
| 128 var s = " " + i + ") " + frame.functionName + " (" + url + (dropLineN
umbers ? "" : ":" + lineNumber) + ")"; | 134 var s = " " + i + ") " + frame.functionName + " (" + url + (dropLineN
umbers ? "" : ":" + lineNumber + (showColumnNumbers ? ":" + columnNumber : ""))
+ ")"; |
| 129 InspectorTest.addResult(s); | 135 InspectorTest.addResult(s); |
| 130 } | 136 } |
| 131 }; | 137 }; |
| 132 | 138 |
| 133 InspectorTest.dumpSourceFrameContents = function(sourceFrame) | 139 InspectorTest.dumpSourceFrameContents = function(sourceFrame) |
| 134 { | 140 { |
| 135 InspectorTest.addResult("==Source frame contents start=="); | 141 InspectorTest.addResult("==Source frame contents start=="); |
| 136 var textEditor = sourceFrame._textEditor; | 142 var textEditor = sourceFrame._textEditor; |
| 137 for (var i = 0; i < textEditor.linesCount; ++i) | 143 for (var i = 0; i < textEditor.linesCount; ++i) |
| 138 InspectorTest.addResult(textEditor.line(i)); | 144 InspectorTest.addResult(textEditor.line(i)); |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 | 314 |
| 309 InspectorTest.checkUILocation = function(uiSourceCode, lineNumber, columnNumber,
location) | 315 InspectorTest.checkUILocation = function(uiSourceCode, lineNumber, columnNumber,
location) |
| 310 { | 316 { |
| 311 InspectorTest.assertEquals(uiSourceCode, location.uiSourceCode, "Incorrect u
iSourceCode, expected '" + (uiSourceCode ? uiSourceCode.originURL() : null) + "'
," + | 317 InspectorTest.assertEquals(uiSourceCode, location.uiSourceCode, "Incorrect u
iSourceCode, expected '" + (uiSourceCode ? uiSourceCode.originURL() : null) + "'
," + |
| 312 " but got '"
+ (location.uiSourceCode ? location.uiSourceCode.originURL() : null) + "'"); | 318 " but got '"
+ (location.uiSourceCode ? location.uiSourceCode.originURL() : null) + "'"); |
| 313 InspectorTest.assertEquals(lineNumber, location.lineNumber, "Incorrect lineN
umber, expected '" + lineNumber + "', but got '" + location.lineNumber + "'"); | 319 InspectorTest.assertEquals(lineNumber, location.lineNumber, "Incorrect lineN
umber, expected '" + lineNumber + "', but got '" + location.lineNumber + "'"); |
| 314 InspectorTest.assertEquals(columnNumber, location.columnNumber, "Incorrect c
olumnNumber, expected '" + columnNumber + "', but got '" + location.columnNumber
+ "'"); | 320 InspectorTest.assertEquals(columnNumber, location.columnNumber, "Incorrect c
olumnNumber, expected '" + columnNumber + "', but got '" + location.columnNumber
+ "'"); |
| 315 }; | 321 }; |
| 316 | 322 |
| 317 }; | 323 }; |
| OLD | NEW |