| 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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 * @return {?Array.<!ConsoleAgent.CallFrame>} | 345 * @return {?Array.<!ConsoleAgent.CallFrame>} |
| 346 */ | 346 */ |
| 347 callSiteStackTrace: function() { }, | 347 callSiteStackTrace: function() { }, |
| 348 | 348 |
| 349 /** | 349 /** |
| 350 * @return {?WebInspector.TimelineModel.Record} | 350 * @return {?WebInspector.TimelineModel.Record} |
| 351 */ | 351 */ |
| 352 initiator: function() { }, | 352 initiator: function() { }, |
| 353 | 353 |
| 354 /** | 354 /** |
| 355 * @return {!WebInspector.Target} | 355 * @return {?WebInspector.Target} |
| 356 */ | 356 */ |
| 357 target: function() { }, | 357 target: function() { }, |
| 358 | 358 |
| 359 /** | 359 /** |
| 360 * @return {number} | 360 * @return {number} |
| 361 */ | 361 */ |
| 362 selfTime: function() { }, | 362 selfTime: function() { }, |
| 363 | 363 |
| 364 /** | 364 /** |
| 365 * @return {!Array.<!WebInspector.TimelineModel.Record>} | 365 * @return {!Array.<!WebInspector.TimelineModel.Record>} |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 563 function recordTimestampComparator(a, b) | 563 function recordTimestampComparator(a, b) |
| 564 { | 564 { |
| 565 // Never return 0, as the merge function will squash identical entri
es. | 565 // Never return 0, as the merge function will squash identical entri
es. |
| 566 return a.startTime() < b.startTime() ? -1 : 1; | 566 return a.startTime() < b.startTime() ? -1 : 1; |
| 567 } | 567 } |
| 568 var result = this._backgroundRecordsBuffer.mergeOrdered(records, recordT
imestampComparator); | 568 var result = this._backgroundRecordsBuffer.mergeOrdered(records, recordT
imestampComparator); |
| 569 this._backgroundRecordsBuffer = []; | 569 this._backgroundRecordsBuffer = []; |
| 570 return result; | 570 return result; |
| 571 } | 571 } |
| 572 } | 572 } |
| OLD | NEW |