| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 * @param {!WebInspector.ExecutionContext} b | 191 * @param {!WebInspector.ExecutionContext} b |
| 192 * @return {number} | 192 * @return {number} |
| 193 */ | 193 */ |
| 194 WebInspector.ExecutionContext.comparator = function(a, b) | 194 WebInspector.ExecutionContext.comparator = function(a, b) |
| 195 { | 195 { |
| 196 // Main world context should always go first. | 196 // Main world context should always go first. |
| 197 if (a.isMainWorldContext) | 197 if (a.isMainWorldContext) |
| 198 return -1; | 198 return -1; |
| 199 if (b.isMainWorldContext) | 199 if (b.isMainWorldContext) |
| 200 return +1; | 200 return +1; |
| 201 return a.name.localeCompare(b.name); | 201 var delta = a.name.localeCompare(b.name); |
| 202 if (delta != 0) return delta; |
| 203 return a.origin.localeCompare(b.origin); |
| 202 } | 204 } |
| 203 | 205 |
| 204 WebInspector.ExecutionContext.prototype = { | 206 WebInspector.ExecutionContext.prototype = { |
| 205 | 207 |
| 206 /** | 208 /** |
| 207 * @param {string} expression | 209 * @param {string} expression |
| 208 * @param {string} objectGroup | 210 * @param {string} objectGroup |
| 209 * @param {boolean} includeCommandLineAPI | 211 * @param {boolean} includeCommandLineAPI |
| 210 * @param {boolean} doNotPauseOnExceptionsAndMuteConsole | 212 * @param {boolean} doNotPauseOnExceptionsAndMuteConsole |
| 211 * @param {boolean} returnByValue | 213 * @param {boolean} returnByValue |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 completionsReadyCallback(results); | 506 completionsReadyCallback(results); |
| 505 }, | 507 }, |
| 506 | 508 |
| 507 __proto__: WebInspector.SDKObject.prototype | 509 __proto__: WebInspector.SDKObject.prototype |
| 508 } | 510 } |
| 509 | 511 |
| 510 /** | 512 /** |
| 511 * @type {!WebInspector.RuntimeModel} | 513 * @type {!WebInspector.RuntimeModel} |
| 512 */ | 514 */ |
| 513 WebInspector.runtimeModel; | 515 WebInspector.runtimeModel; |
| OLD | NEW |