| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
| 4 * Copyright (C) 2009 Joseph Pecoraro | 4 * Copyright (C) 2009 Joseph Pecoraro |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * | 9 * |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 /** | 30 /** |
| 31 * @implements {Console.ConsoleViewportElement} | 31 * @implements {Console.ConsoleViewportElement} |
| 32 * @unrestricted | 32 * @unrestricted |
| 33 */ | 33 */ |
| 34 Console.ConsoleViewMessage = class { | 34 Console.ConsoleViewMessage = class { |
| 35 /** | 35 /** |
| 36 * @param {!ConsoleModel.ConsoleMessage} consoleMessage | 36 * @param {!ConsoleModel.ConsoleMessage} consoleMessage |
| 37 * @param {!Components.Linkifier} linkifier | 37 * @param {!Components.Linkifier} linkifier |
| 38 * @param {!ProductRegistry.BadgePool} badgePool |
| 38 * @param {number} nestingLevel | 39 * @param {number} nestingLevel |
| 39 */ | 40 */ |
| 40 constructor(consoleMessage, linkifier, nestingLevel) { | 41 constructor(consoleMessage, linkifier, badgePool, nestingLevel) { |
| 41 this._message = consoleMessage; | 42 this._message = consoleMessage; |
| 42 this._linkifier = linkifier; | 43 this._linkifier = linkifier; |
| 44 this._badgePool = badgePool; |
| 43 this._repeatCount = 1; | 45 this._repeatCount = 1; |
| 44 this._closeGroupDecorationCount = 0; | 46 this._closeGroupDecorationCount = 0; |
| 45 this._nestingLevel = nestingLevel; | 47 this._nestingLevel = nestingLevel; |
| 46 | 48 |
| 47 /** @type {?DataGrid.DataGrid} */ | 49 /** @type {?DataGrid.DataGrid} */ |
| 48 this._dataGrid = null; | 50 this._dataGrid = null; |
| 49 this._previewFormatter = new ObjectUI.RemoteObjectPreviewFormatter(); | 51 this._previewFormatter = new ObjectUI.RemoteObjectPreviewFormatter(); |
| 50 this._searchRegex = null; | 52 this._searchRegex = null; |
| 51 /** @type {?UI.Icon} */ | 53 /** @type {?UI.Icon} */ |
| 52 this._messageLevelIcon = null; | 54 this._messageLevelIcon = null; |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 /** | 113 /** |
| 112 * @return {!Element} | 114 * @return {!Element} |
| 113 */ | 115 */ |
| 114 _buildTableMessage() { | 116 _buildTableMessage() { |
| 115 var formattedMessage = createElement('span'); | 117 var formattedMessage = createElement('span'); |
| 116 UI.appendStyle(formattedMessage, 'object_ui/objectValue.css'); | 118 UI.appendStyle(formattedMessage, 'object_ui/objectValue.css'); |
| 117 formattedMessage.className = 'source-code'; | 119 formattedMessage.className = 'source-code'; |
| 118 var anchorElement = this._buildMessageAnchor(); | 120 var anchorElement = this._buildMessageAnchor(); |
| 119 if (anchorElement) | 121 if (anchorElement) |
| 120 formattedMessage.appendChild(anchorElement); | 122 formattedMessage.appendChild(anchorElement); |
| 123 var badgeElement = this._buildMessageBadge(); |
| 124 if (badgeElement) |
| 125 formattedMessage.appendChild(badgeElement); |
| 121 | 126 |
| 122 var table = this._message.parameters && this._message.parameters.length ? th
is._message.parameters[0] : null; | 127 var table = this._message.parameters && this._message.parameters.length ? th
is._message.parameters[0] : null; |
| 123 if (table) | 128 if (table) |
| 124 table = this._parameterToRemoteObject(table); | 129 table = this._parameterToRemoteObject(table); |
| 125 if (!table || !table.preview) | 130 if (!table || !table.preview) |
| 126 return formattedMessage; | 131 return formattedMessage; |
| 127 | 132 |
| 128 var columnNames = []; | 133 var columnNames = []; |
| 129 var preview = table.preview; | 134 var preview = table.preview; |
| 130 var rows = []; | 135 var rows = []; |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 } | 255 } |
| 251 messageElement.classList.add('console-message-text'); | 256 messageElement.classList.add('console-message-text'); |
| 252 | 257 |
| 253 var formattedMessage = createElement('span'); | 258 var formattedMessage = createElement('span'); |
| 254 UI.appendStyle(formattedMessage, 'object_ui/objectValue.css'); | 259 UI.appendStyle(formattedMessage, 'object_ui/objectValue.css'); |
| 255 formattedMessage.className = 'source-code'; | 260 formattedMessage.className = 'source-code'; |
| 256 | 261 |
| 257 var anchorElement = this._buildMessageAnchor(); | 262 var anchorElement = this._buildMessageAnchor(); |
| 258 if (anchorElement) | 263 if (anchorElement) |
| 259 formattedMessage.appendChild(anchorElement); | 264 formattedMessage.appendChild(anchorElement); |
| 265 var badgeElement = this._buildMessageBadge(); |
| 266 if (badgeElement) |
| 267 formattedMessage.appendChild(badgeElement); |
| 260 formattedMessage.appendChild(messageElement); | 268 formattedMessage.appendChild(messageElement); |
| 261 return formattedMessage; | 269 return formattedMessage; |
| 262 } | 270 } |
| 263 | 271 |
| 264 /** | 272 /** |
| 265 * @return {?Element} | 273 * @return {?Element} |
| 266 */ | 274 */ |
| 267 _buildMessageAnchor() { | 275 _buildMessageAnchor() { |
| 268 var anchorElement = null; | 276 var anchorElement = null; |
| 269 if (this._message.source !== ConsoleModel.ConsoleMessage.MessageSource.Netwo
rk || this._message.request) { | 277 if (this._message.source !== ConsoleModel.ConsoleMessage.MessageSource.Netwo
rk || this._message.request) { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 283 if (anchorElement) { | 291 if (anchorElement) { |
| 284 var anchorWrapperElement = createElementWithClass('span', 'console-message
-anchor'); | 292 var anchorWrapperElement = createElementWithClass('span', 'console-message
-anchor'); |
| 285 anchorWrapperElement.appendChild(anchorElement); | 293 anchorWrapperElement.appendChild(anchorElement); |
| 286 anchorWrapperElement.createTextChild(' '); | 294 anchorWrapperElement.createTextChild(' '); |
| 287 return anchorWrapperElement; | 295 return anchorWrapperElement; |
| 288 } | 296 } |
| 289 return null; | 297 return null; |
| 290 } | 298 } |
| 291 | 299 |
| 292 /** | 300 /** |
| 301 * @return {?Element} |
| 302 */ |
| 303 _buildMessageBadge() { |
| 304 if (!this._message.executionContextId) |
| 305 return null; |
| 306 var runtimeModel = this._message.runtimeModel(); |
| 307 if (!runtimeModel) |
| 308 return null; |
| 309 var executionContext = runtimeModel.executionContext(this._message.execution
ContextId); |
| 310 if (!executionContext || !executionContext.frameId) |
| 311 return null; |
| 312 var resourceTreeModel = executionContext.target().model(SDK.ResourceTreeMode
l); |
| 313 if (!resourceTreeModel) |
| 314 return null; |
| 315 var frame = resourceTreeModel.frameForId(executionContext.frameId); |
| 316 if (!frame || !frame.parentFrame) |
| 317 return null; |
| 318 var badgeElement = this._badgePool.badgeForFrame(frame); |
| 319 badgeElement.classList.add('console-message-badge'); |
| 320 return badgeElement; |
| 321 } |
| 322 |
| 323 /** |
| 293 * @return {!Element} | 324 * @return {!Element} |
| 294 */ | 325 */ |
| 295 _buildMessageWithStackTrace() { | 326 _buildMessageWithStackTrace() { |
| 296 var toggleElement = createElementWithClass('div', 'console-message-stack-tra
ce-toggle'); | 327 var toggleElement = createElementWithClass('div', 'console-message-stack-tra
ce-toggle'); |
| 297 var contentElement = toggleElement.createChild('div', 'console-message-stack
-trace-wrapper'); | 328 var contentElement = toggleElement.createChild('div', 'console-message-stack
-trace-wrapper'); |
| 298 | 329 |
| 299 var messageElement = this._buildMessage(); | 330 var messageElement = this._buildMessage(); |
| 300 var icon = UI.Icon.create('smallicon-triangle-right', 'console-message-expan
d-icon'); | 331 var icon = UI.Icon.create('smallicon-triangle-right', 'console-message-expan
d-icon'); |
| 301 var clickableElement = contentElement.createChild('div'); | 332 var clickableElement = contentElement.createChild('div'); |
| 302 clickableElement.appendChild(icon); | 333 clickableElement.appendChild(icon); |
| (...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1176 } | 1207 } |
| 1177 }; | 1208 }; |
| 1178 | 1209 |
| 1179 /** | 1210 /** |
| 1180 * @unrestricted | 1211 * @unrestricted |
| 1181 */ | 1212 */ |
| 1182 Console.ConsoleGroupViewMessage = class extends Console.ConsoleViewMessage { | 1213 Console.ConsoleGroupViewMessage = class extends Console.ConsoleViewMessage { |
| 1183 /** | 1214 /** |
| 1184 * @param {!ConsoleModel.ConsoleMessage} consoleMessage | 1215 * @param {!ConsoleModel.ConsoleMessage} consoleMessage |
| 1185 * @param {!Components.Linkifier} linkifier | 1216 * @param {!Components.Linkifier} linkifier |
| 1217 * @param {!ProductRegistry.BadgePool} badgePool |
| 1186 * @param {number} nestingLevel | 1218 * @param {number} nestingLevel |
| 1187 */ | 1219 */ |
| 1188 constructor(consoleMessage, linkifier, nestingLevel) { | 1220 constructor(consoleMessage, linkifier, badgePool, nestingLevel) { |
| 1189 console.assert(consoleMessage.isGroupStartMessage()); | 1221 console.assert(consoleMessage.isGroupStartMessage()); |
| 1190 super(consoleMessage, linkifier, nestingLevel); | 1222 super(consoleMessage, linkifier, badgePool, nestingLevel); |
| 1191 this._collapsed = consoleMessage.type === ConsoleModel.ConsoleMessage.Messag
eType.StartGroupCollapsed; | 1223 this._collapsed = consoleMessage.type === ConsoleModel.ConsoleMessage.Messag
eType.StartGroupCollapsed; |
| 1192 /** @type {?UI.Icon} */ | 1224 /** @type {?UI.Icon} */ |
| 1193 this._expandGroupIcon = null; | 1225 this._expandGroupIcon = null; |
| 1194 } | 1226 } |
| 1195 | 1227 |
| 1196 /** | 1228 /** |
| 1197 * @param {boolean} collapsed | 1229 * @param {boolean} collapsed |
| 1198 */ | 1230 */ |
| 1199 setCollapsed(collapsed) { | 1231 setCollapsed(collapsed) { |
| 1200 this._collapsed = collapsed; | 1232 this._collapsed = collapsed; |
| (...skipping 15 matching lines...) Expand all Loading... |
| 1216 toMessageElement() { | 1248 toMessageElement() { |
| 1217 if (!this._element) { | 1249 if (!this._element) { |
| 1218 super.toMessageElement(); | 1250 super.toMessageElement(); |
| 1219 this._expandGroupIcon = UI.Icon.create('', 'expand-group-icon'); | 1251 this._expandGroupIcon = UI.Icon.create('', 'expand-group-icon'); |
| 1220 this._contentElement.insertBefore(this._expandGroupIcon, this._contentElem
ent.firstChild); | 1252 this._contentElement.insertBefore(this._expandGroupIcon, this._contentElem
ent.firstChild); |
| 1221 this.setCollapsed(this._collapsed); | 1253 this.setCollapsed(this._collapsed); |
| 1222 } | 1254 } |
| 1223 return this._element; | 1255 return this._element; |
| 1224 } | 1256 } |
| 1225 }; | 1257 }; |
| OLD | NEW |