| OLD | NEW |
| 1 var initialize_ConsoleTest = function() { | 1 var initialize_ConsoleTest = function() { |
| 2 | 2 |
| 3 InspectorTest.preloadPanel("console"); | 3 InspectorTest.preloadPanel("console"); |
| 4 | 4 |
| 5 InspectorTest.evaluateInConsole = function(code, callback) | 5 InspectorTest.evaluateInConsole = function(code, callback) |
| 6 { | 6 { |
| 7 callback = InspectorTest.safeWrap(callback); | 7 callback = InspectorTest.safeWrap(callback); |
| 8 | 8 |
| 9 var consoleView = WebInspector.ConsolePanel._view(); | 9 var consoleView = WebInspector.ConsolePanel._view(); |
| 10 consoleView.visible = true; | 10 consoleView.visible = true; |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 { | 67 { |
| 68 var viewport = WebInspector.ConsolePanel._view()._viewport; | 68 var viewport = WebInspector.ConsolePanel._view()._viewport; |
| 69 viewport.element.style.width = width + "px"; | 69 viewport.element.style.width = width + "px"; |
| 70 viewport.element.style.height = height + "px"; | 70 viewport.element.style.height = height + "px"; |
| 71 viewport.element.style.position = "absolute"; | 71 viewport.element.style.position = "absolute"; |
| 72 viewport.invalidate(); | 72 viewport.invalidate(); |
| 73 } | 73 } |
| 74 | 74 |
| 75 InspectorTest.dumpConsoleMessages = function(printOriginatingCommand, dumpClassN
ames, formatter) | 75 InspectorTest.dumpConsoleMessages = function(printOriginatingCommand, dumpClassN
ames, formatter) |
| 76 { | 76 { |
| 77 InspectorTest.addResults(InspectorTest.dumpConsoleMessagesIntoArray(printOri
ginatingCommand, dumpClassNames, formatter)); | |
| 78 } | |
| 79 | |
| 80 InspectorTest.dumpConsoleMessagesIntoArray = function(printOriginatingCommand, d
umpClassNames, formatter) | |
| 81 { | |
| 82 formatter = formatter || InspectorTest.prepareConsoleMessageText; | 77 formatter = formatter || InspectorTest.prepareConsoleMessageText; |
| 83 var result = []; | 78 var result = []; |
| 84 InspectorTest.disableConsoleViewport(); | 79 InspectorTest.disableConsoleViewport(); |
| 85 var consoleView = WebInspector.ConsolePanel._view(); | 80 var consoleView = WebInspector.ConsolePanel._view(); |
| 86 if (consoleView._needsFullUpdate) | 81 if (consoleView._needsFullUpdate) |
| 87 consoleView._updateMessageList(); | 82 consoleView._updateMessageList(); |
| 88 var viewMessages = consoleView._visibleViewMessages; | 83 var viewMessages = consoleView._visibleViewMessages; |
| 89 for (var i = 0; i < viewMessages.length; ++i) { | 84 for (var i = 0; i < viewMessages.length; ++i) { |
| 90 var uiMessage = viewMessages[i]; | 85 var uiMessage = viewMessages[i]; |
| 91 var message = uiMessage.consoleMessage(); | 86 var message = uiMessage.consoleMessage(); |
| 92 var element = uiMessage.contentElement(); | 87 var element = uiMessage.contentElement(); |
| 93 | 88 |
| 94 if (dumpClassNames) { | 89 if (dumpClassNames) { |
| 95 var classNames = []; | 90 var classNames = []; |
| 96 for (var node = element.firstChild; node; node = node.traverseNextNo
de(element)) { | 91 for (var node = element.firstChild; node; node = node.traverseNextNo
de(element)) { |
| 97 if (node.nodeType === Node.ELEMENT_NODE && node.className) | 92 if (node.nodeType === Node.ELEMENT_NODE && node.className) |
| 98 classNames.push(node.className); | 93 classNames.push(node.className); |
| 99 } | 94 } |
| 100 } | 95 } |
| 101 | 96 |
| 102 if (InspectorTest.dumpConsoleTableMessage(uiMessage, false, result)) { | 97 if (InspectorTest.dumpConsoleTableMessage(uiMessage, false)) { |
| 103 if (dumpClassNames) | 98 if (dumpClassNames) |
| 104 result.push(classNames.join(" > ")); | 99 InspectorTest.addResult(classNames.join(" > ")); |
| 105 } else { | 100 } else { |
| 106 var messageText = formatter(element, message); | 101 var messageText = formatter(element, message); |
| 107 result.push(messageText + (dumpClassNames ? " " + classNames.join("
> ") : "")); | 102 InspectorTest.addResult(messageText + (dumpClassNames ? " " + classN
ames.join(" > ") : "")); |
| 108 } | 103 } |
| 109 | 104 |
| 110 if (printOriginatingCommand && uiMessage.consoleMessage().originatingMes
sage()) | 105 if (printOriginatingCommand && uiMessage.consoleMessage().originatingMes
sage()) |
| 111 result.push("Originating from: " + uiMessage.consoleMessage().origin
atingMessage().messageText); | 106 InspectorTest.addResult("Originating from: " + uiMessage.consoleMess
age().originatingMessage().messageText); |
| 112 } | 107 } |
| 113 return result; | 108 return result; |
| 114 } | 109 } |
| 115 | 110 |
| 116 InspectorTest.dumpConsoleTableMessage = function(viewMessage, forceInvalidate, r
esults) | 111 InspectorTest.dumpConsoleTableMessage = function(viewMessage, forceInvalidate) |
| 117 { | 112 { |
| 118 if (forceInvalidate) | 113 if (forceInvalidate) |
| 119 WebInspector.ConsolePanel._view()._viewport.invalidate(); | 114 WebInspector.ConsolePanel._view()._viewport.invalidate(); |
| 120 var table = viewMessage.contentElement(); | 115 var table = viewMessage.contentElement(); |
| 121 var headers = table.querySelectorAll("th div"); | 116 var headers = table.querySelectorAll("th div"); |
| 122 if (!headers.length) | 117 if (!headers.length) |
| 123 return false; | 118 return false; |
| 124 | 119 |
| 125 var headerLine = ""; | 120 var headerLine = ""; |
| 126 for (var i = 0; i < headers.length; i++) | 121 for (var i = 0; i < headers.length; i++) |
| 127 headerLine += headers[i].textContent + " | "; | 122 headerLine += headers[i].textContent + " | "; |
| 128 | 123 |
| 129 addResult("HEADER " + headerLine); | 124 InspectorTest.addResult("HEADER " + headerLine); |
| 130 | 125 |
| 131 var rows = table.querySelectorAll(".data-container tr"); | 126 var rows = table.querySelectorAll(".data-container tr"); |
| 132 | 127 |
| 133 for (var i = 0; i < rows.length; i++) { | 128 for (var i = 0; i < rows.length; i++) { |
| 134 var row = rows[i]; | 129 var row = rows[i]; |
| 135 var rowLine = ""; | 130 var rowLine = ""; |
| 136 var items = row.querySelectorAll("td > span"); | 131 var items = row.querySelectorAll("td > span"); |
| 137 for (var j = 0; j < items.length; j++) | 132 for (var j = 0; j < items.length; j++) |
| 138 rowLine += items[j].textContent + " | "; | 133 rowLine += items[j].textContent + " | "; |
| 139 | 134 |
| 140 if (rowLine.trim()) | 135 if (rowLine.trim()) |
| 141 addResult("ROW " + rowLine); | 136 InspectorTest.addResult("ROW " + rowLine); |
| 142 } | 137 } |
| 143 | |
| 144 function addResult(x) | |
| 145 { | |
| 146 if (results) | |
| 147 results.push(x); | |
| 148 else | |
| 149 InspectorTest.addResult(x); | |
| 150 } | |
| 151 | |
| 152 return true; | 138 return true; |
| 153 } | 139 } |
| 154 | 140 |
| 155 InspectorTest.dumpConsoleMessagesWithStyles = function(sortMessages) | 141 InspectorTest.dumpConsoleMessagesWithStyles = function(sortMessages) |
| 156 { | 142 { |
| 157 var result = []; | 143 var result = []; |
| 158 var messageViews = WebInspector.ConsolePanel._view()._visibleViewMessages; | 144 var messageViews = WebInspector.ConsolePanel._view()._visibleViewMessages; |
| 159 for (var i = 0; i < messageViews.length; ++i) { | 145 for (var i = 0; i < messageViews.length; ++i) { |
| 160 var element = messageViews[i].contentElement(); | 146 var element = messageViews[i].contentElement(); |
| 161 var messageText = InspectorTest.prepareConsoleMessageText(element) | 147 var messageText = InspectorTest.prepareConsoleMessageText(element) |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 } | 256 } |
| 271 if (!option) { | 257 if (!option) { |
| 272 InspectorTest.addResult("FAILED: context with prefix: " + namePrefix +
" not found in the context list"); | 258 InspectorTest.addResult("FAILED: context with prefix: " + namePrefix +
" not found in the context list"); |
| 273 return; | 259 return; |
| 274 } | 260 } |
| 275 option.selected = true; | 261 option.selected = true; |
| 276 WebInspector.ConsolePanel._view()._executionContextChanged(); | 262 WebInspector.ConsolePanel._view()._executionContextChanged(); |
| 277 } | 263 } |
| 278 | 264 |
| 279 } | 265 } |
| OLD | NEW |