| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2012 Intel Inc. All rights reserved. | 3 * Copyright (C) 2012 Intel Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 return true; | 529 return true; |
| 530 }, | 530 }, |
| 531 | 531 |
| 532 /** | 532 /** |
| 533 * @param {!File} file | 533 * @param {!File} file |
| 534 */ | 534 */ |
| 535 _loadFromFile: function(file) | 535 _loadFromFile: function(file) |
| 536 { | 536 { |
| 537 if (this._state !== WebInspector.TimelinePanel.State.Idle) | 537 if (this._state !== WebInspector.TimelinePanel.State.Idle) |
| 538 return; | 538 return; |
| 539 WebInspector.TimelineLoader.loadFromFile(this._model, file, this._prepar
eToLoadTimeline()); | 539 this._model.loadFromFile(file, this._prepareToLoadTimeline()); |
| 540 this._createFileSelector(); | 540 this._createFileSelector(); |
| 541 }, | 541 }, |
| 542 | 542 |
| 543 /** | 543 /** |
| 544 * @param {string} url | 544 * @param {string} url |
| 545 */ | 545 */ |
| 546 _loadFromURL: function(url) | 546 _loadFromURL: function(url) |
| 547 { | 547 { |
| 548 if (this._state !== WebInspector.TimelinePanel.State.Idle) | 548 if (this._state !== WebInspector.TimelinePanel.State.Idle) |
| 549 return; | 549 return; |
| 550 WebInspector.TimelineLoader.loadFromURL(this._model, url, this._prepareT
oLoadTimeline()); | 550 this._model.loadFromURL(url, this._prepareToLoadTimeline()); |
| 551 }, | 551 }, |
| 552 | 552 |
| 553 _refreshViews: function() | 553 _refreshViews: function() |
| 554 { | 554 { |
| 555 for (var i = 0; i < this._currentViews.length; ++i) { | 555 for (var i = 0; i < this._currentViews.length; ++i) { |
| 556 var view = this._currentViews[i]; | 556 var view = this._currentViews[i]; |
| 557 view.refreshRecords(); | 557 view.refreshRecords(); |
| 558 } | 558 } |
| 559 this._updateSelectionDetails(); | 559 this._updateSelectionDetails(); |
| 560 }, | 560 }, |
| (...skipping 1555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2116 * @override | 2116 * @override |
| 2117 * @param {!WebInspector.Target} target | 2117 * @param {!WebInspector.Target} target |
| 2118 */ | 2118 */ |
| 2119 targetRemoved: function(target) | 2119 targetRemoved: function(target) |
| 2120 { | 2120 { |
| 2121 this._targets.remove(target, true); | 2121 this._targets.remove(target, true); |
| 2122 }, | 2122 }, |
| 2123 | 2123 |
| 2124 __proto__: WebInspector.Object.prototype | 2124 __proto__: WebInspector.Object.prototype |
| 2125 } | 2125 } |
| OLD | NEW |