| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2009 Joseph Pecoraro | 3 * Copyright (C) 2009 Joseph Pecoraro |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 if (executionContext.isMainWorldContext) { | 356 if (executionContext.isMainWorldContext) { |
| 357 if (executionContext.frameId) { | 357 if (executionContext.frameId) { |
| 358 var frame = executionContext.target().resourceTreeModel.frameFor
Id(executionContext.frameId); | 358 var frame = executionContext.target().resourceTreeModel.frameFor
Id(executionContext.frameId); |
| 359 result = frame ? frame.displayName() : (executionContext.origin
|| executionContext.name); | 359 result = frame ? frame.displayName() : (executionContext.origin
|| executionContext.name); |
| 360 } else { | 360 } else { |
| 361 result = WebInspector.displayNameForURL(executionContext.origin)
|| executionContext.name; | 361 result = WebInspector.displayNameForURL(executionContext.origin)
|| executionContext.name; |
| 362 } | 362 } |
| 363 } else | 363 } else |
| 364 result = "\u00a0\u00a0\u00a0\u00a0" + (executionContext.name || exec
utionContext.origin); | 364 result = "\u00a0\u00a0\u00a0\u00a0" + (executionContext.name || exec
utionContext.origin); |
| 365 | 365 |
| 366 var maxLength = 50; | 366 var maxLength = 200; |
| 367 return result.trimMiddle(maxLength); | 367 return result.trimMiddle(maxLength); |
| 368 }, | 368 }, |
| 369 | 369 |
| 370 /** | 370 /** |
| 371 * @param {!WebInspector.Event} event | 371 * @param {!WebInspector.Event} event |
| 372 */ | 372 */ |
| 373 _onExecutionContextCreated: function(event) | 373 _onExecutionContextCreated: function(event) |
| 374 { | 374 { |
| 375 var executionContext = /** @type {!WebInspector.ExecutionContext} */ (ev
ent.data); | 375 var executionContext = /** @type {!WebInspector.ExecutionContext} */ (ev
ent.data); |
| 376 this._executionContextCreated(executionContext); | 376 this._executionContextCreated(executionContext); |
| (...skipping 915 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1292 WebInspector.ConsoleView.ShowConsoleActionDelegate.prototype = { | 1292 WebInspector.ConsoleView.ShowConsoleActionDelegate.prototype = { |
| 1293 /** | 1293 /** |
| 1294 * @return {boolean} | 1294 * @return {boolean} |
| 1295 */ | 1295 */ |
| 1296 handleAction: function() | 1296 handleAction: function() |
| 1297 { | 1297 { |
| 1298 WebInspector.console.show(); | 1298 WebInspector.console.show(); |
| 1299 return true; | 1299 return true; |
| 1300 } | 1300 } |
| 1301 } | 1301 } |
| OLD | NEW |