| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org> | 3 * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org> |
| 4 * Copyright (C) 2011 Google Inc. All rights reserved. | 4 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * | 9 * |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 709 }, | 709 }, |
| 710 | 710 |
| 711 /** | 711 /** |
| 712 * @override | 712 * @override |
| 713 */ | 713 */ |
| 714 tracingComplete: function() | 714 tracingComplete: function() |
| 715 { | 715 { |
| 716 if (!this._tracingModel) | 716 if (!this._tracingModel) |
| 717 return; | 717 return; |
| 718 this._tracingModel.tracingComplete(); | 718 this._tracingModel.tracingComplete(); |
| 719 var resourceTreeModel = this._target.resourceTreeModel; | 719 WebInspector.targetManager.resumeReload(this._target); |
| 720 this._target = null; | 720 this._target = null; |
| 721 setImmediate(resourceTreeModel.resumeReload.bind(resourceTreeModel)); | |
| 722 this._callback(new WebInspector.FilmStripModel(this._tracingModel, this.
_timeCalculator.minimumBoundary() * 1000)); | 721 this._callback(new WebInspector.FilmStripModel(this._tracingModel, this.
_timeCalculator.minimumBoundary() * 1000)); |
| 723 delete this._callback; | 722 delete this._callback; |
| 724 }, | 723 }, |
| 725 | 724 |
| 726 /** | 725 /** |
| 727 * @override | 726 * @override |
| 728 */ | 727 */ |
| 729 tracingBufferUsage: function() | 728 tracingBufferUsage: function() |
| 730 { | 729 { |
| 731 }, | 730 }, |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 763 | 762 |
| 764 /** | 763 /** |
| 765 * @param {function(?WebInspector.FilmStripModel)} callback | 764 * @param {function(?WebInspector.FilmStripModel)} callback |
| 766 */ | 765 */ |
| 767 stopRecording: function(callback) | 766 stopRecording: function(callback) |
| 768 { | 767 { |
| 769 if (!this._target) | 768 if (!this._target) |
| 770 return; | 769 return; |
| 771 | 770 |
| 772 this._target.tracingManager.stop(); | 771 this._target.tracingManager.stop(); |
| 773 this._target.resourceTreeModel.suspendReload(); | 772 WebInspector.targetManager.suspendReload(this._target); |
| 774 this._callback = callback; | 773 this._callback = callback; |
| 775 this._filmStripView.setStatusText(WebInspector.UIString("Fetching frames
...")); | 774 this._filmStripView.setStatusText(WebInspector.UIString("Fetching frames
...")); |
| 776 } | 775 } |
| 777 } | 776 } |
| 778 | 777 |
| 779 /** | 778 /** |
| 780 * @constructor | 779 * @constructor |
| 781 * @implements {WebInspector.ActionDelegate} | 780 * @implements {WebInspector.ActionDelegate} |
| 782 */ | 781 */ |
| 783 WebInspector.NetworkPanel.RecordActionDelegate = function() | 782 WebInspector.NetworkPanel.RecordActionDelegate = function() |
| 784 { | 783 { |
| 785 } | 784 } |
| 786 WebInspector.NetworkPanel.RecordActionDelegate.prototype = { | 785 WebInspector.NetworkPanel.RecordActionDelegate.prototype = { |
| 787 /** | 786 /** |
| 788 * @override | 787 * @override |
| 789 * @param {!WebInspector.Context} context | 788 * @param {!WebInspector.Context} context |
| 790 * @param {string} actionId | 789 * @param {string} actionId |
| 791 * @return {boolean} | 790 * @return {boolean} |
| 792 */ | 791 */ |
| 793 handleAction: function(context, actionId) | 792 handleAction: function(context, actionId) |
| 794 { | 793 { |
| 795 var panel = WebInspector.context.flavor(WebInspector.NetworkPanel); | 794 var panel = WebInspector.context.flavor(WebInspector.NetworkPanel); |
| 796 console.assert(panel && panel instanceof WebInspector.NetworkPanel); | 795 console.assert(panel && panel instanceof WebInspector.NetworkPanel); |
| 797 panel._toggleRecording(); | 796 panel._toggleRecording(); |
| 798 return true; | 797 return true; |
| 799 } | 798 } |
| 800 } | 799 } |
| OLD | NEW |