| 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 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 381 * @param {number} endTime | 381 * @param {number} endTime |
| 382 */ | 382 */ |
| 383 setEndTime: function(endTime) { }, | 383 setEndTime: function(endTime) { }, |
| 384 | 384 |
| 385 /** | 385 /** |
| 386 * @return {!Object} | 386 * @return {!Object} |
| 387 */ | 387 */ |
| 388 data: function() { }, | 388 data: function() { }, |
| 389 | 389 |
| 390 /** | 390 /** |
| 391 * @return {?Object} |
| 392 */ |
| 393 highlightQuad: function() { }, |
| 394 |
| 395 /** |
| 391 * @return {string} | 396 * @return {string} |
| 392 */ | 397 */ |
| 393 type: function() { }, | 398 type: function() { }, |
| 394 | 399 |
| 395 /** | 400 /** |
| 396 * @return {string} | 401 * @return {string} |
| 397 */ | 402 */ |
| 398 frameId: function() { }, | 403 frameId: function() { }, |
| 399 | 404 |
| 400 /** | 405 /** |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 486 function recordTimestampComparator(a, b) | 491 function recordTimestampComparator(a, b) |
| 487 { | 492 { |
| 488 // Never return 0, as the merge function will squash identical entri
es. | 493 // Never return 0, as the merge function will squash identical entri
es. |
| 489 return a.startTime() < b.startTime() ? -1 : 1; | 494 return a.startTime() < b.startTime() ? -1 : 1; |
| 490 } | 495 } |
| 491 var result = this._backgroundRecordsBuffer.mergeOrdered(records, recordT
imestampComparator); | 496 var result = this._backgroundRecordsBuffer.mergeOrdered(records, recordT
imestampComparator); |
| 492 this._backgroundRecordsBuffer = []; | 497 this._backgroundRecordsBuffer = []; |
| 493 return result; | 498 return result; |
| 494 } | 499 } |
| 495 } | 500 } |
| OLD | NEW |