| 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 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 | 272 |
| 273 /** | 273 /** |
| 274 * @return {!Array.<!WebInspector.TimelineModel.Record>} | 274 * @return {!Array.<!WebInspector.TimelineModel.Record>} |
| 275 */ | 275 */ |
| 276 records: function() | 276 records: function() |
| 277 { | 277 { |
| 278 return this._records; | 278 return this._records; |
| 279 }, | 279 }, |
| 280 | 280 |
| 281 /** | 281 /** |
| 282 * @return {boolean} | |
| 283 */ | |
| 284 bufferEvents: function() | |
| 285 { | |
| 286 return false; | |
| 287 }, | |
| 288 | |
| 289 /** | |
| 290 * @param {!Blob} file | 282 * @param {!Blob} file |
| 291 * @param {!WebInspector.Progress} progress | 283 * @param {!WebInspector.Progress} progress |
| 292 */ | 284 */ |
| 293 loadFromFile: function(file, progress) | 285 loadFromFile: function(file, progress) |
| 294 { | 286 { |
| 295 throw new Error("Not implemented"); | 287 throw new Error("Not implemented"); |
| 296 }, | 288 }, |
| 297 | 289 |
| 298 /** | 290 /** |
| 299 * @param {string} url | 291 * @param {string} url |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 758 function recordTimestampComparator(a, b) | 750 function recordTimestampComparator(a, b) |
| 759 { | 751 { |
| 760 // Never return 0, as the merge function will squash identical entri
es. | 752 // Never return 0, as the merge function will squash identical entri
es. |
| 761 return a.startTime() < b.startTime() ? -1 : 1; | 753 return a.startTime() < b.startTime() ? -1 : 1; |
| 762 } | 754 } |
| 763 var result = this._backgroundRecordsBuffer.mergeOrdered(records, recordT
imestampComparator); | 755 var result = this._backgroundRecordsBuffer.mergeOrdered(records, recordT
imestampComparator); |
| 764 this._backgroundRecordsBuffer = []; | 756 this._backgroundRecordsBuffer = []; |
| 765 return result; | 757 return result; |
| 766 } | 758 } |
| 767 } | 759 } |
| OLD | NEW |