| 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 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 * @return {?Object} | 404 * @return {?Object} |
| 405 */ | 405 */ |
| 406 highlightQuad: function() { }, | 406 highlightQuad: function() { }, |
| 407 | 407 |
| 408 /** | 408 /** |
| 409 * @return {string} | 409 * @return {string} |
| 410 */ | 410 */ |
| 411 type: function() { }, | 411 type: function() { }, |
| 412 | 412 |
| 413 /** | 413 /** |
| 414 * @return {?Object} |
| 415 */ |
| 416 counters: function() { }, |
| 417 |
| 418 /** |
| 414 * @return {string} | 419 * @return {string} |
| 415 */ | 420 */ |
| 416 frameId: function() { }, | 421 frameId: function() { }, |
| 417 | 422 |
| 418 /** | 423 /** |
| 419 * @return {?Array.<!ConsoleAgent.CallFrame>} | 424 * @return {?Array.<!ConsoleAgent.CallFrame>} |
| 420 */ | 425 */ |
| 421 stackTrace: function() { }, | 426 stackTrace: function() { }, |
| 422 | 427 |
| 423 /** | 428 /** |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 function recordTimestampComparator(a, b) | 509 function recordTimestampComparator(a, b) |
| 505 { | 510 { |
| 506 // Never return 0, as the merge function will squash identical entri
es. | 511 // Never return 0, as the merge function will squash identical entri
es. |
| 507 return a.startTime() < b.startTime() ? -1 : 1; | 512 return a.startTime() < b.startTime() ? -1 : 1; |
| 508 } | 513 } |
| 509 var result = this._backgroundRecordsBuffer.mergeOrdered(records, recordT
imestampComparator); | 514 var result = this._backgroundRecordsBuffer.mergeOrdered(records, recordT
imestampComparator); |
| 510 this._backgroundRecordsBuffer = []; | 515 this._backgroundRecordsBuffer = []; |
| 511 return result; | 516 return result; |
| 512 } | 517 } |
| 513 } | 518 } |
| OLD | NEW |