| Index: third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js b/third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js
|
| index 321ddd379a47febba0aa9df262c7945891944d20..464b4b6004e4cdf3573b4d7468b035ce4b2ac9f1 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js
|
| @@ -28,40 +28,40 @@
|
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
| /**
|
| - * @implements {WebInspector.ContextMenu.Provider}
|
| - * @implements {WebInspector.Searchable}
|
| + * @implements {UI.ContextMenu.Provider}
|
| + * @implements {UI.Searchable}
|
| * @unrestricted
|
| */
|
| -WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| +Network.NetworkPanel = class extends UI.Panel {
|
| constructor() {
|
| super('network');
|
| this.registerRequiredCSS('network/networkPanel.css');
|
|
|
| - this._networkLogShowOverviewSetting = WebInspector.settings.createSetting('networkLogShowOverview', true);
|
| - this._networkLogLargeRowsSetting = WebInspector.settings.createSetting('networkLogLargeRows', false);
|
| - this._networkRecordFilmStripSetting = WebInspector.settings.createSetting('networkRecordFilmStripSetting', false);
|
| + this._networkLogShowOverviewSetting = Common.settings.createSetting('networkLogShowOverview', true);
|
| + this._networkLogLargeRowsSetting = Common.settings.createSetting('networkLogLargeRows', false);
|
| + this._networkRecordFilmStripSetting = Common.settings.createSetting('networkRecordFilmStripSetting', false);
|
| this._toggleRecordAction =
|
| - /** @type {!WebInspector.Action }*/ (WebInspector.actionRegistry.action('network.toggle-recording'));
|
| + /** @type {!UI.Action }*/ (UI.actionRegistry.action('network.toggle-recording'));
|
|
|
| - /** @type {?WebInspector.FilmStripView} */
|
| + /** @type {?Components.FilmStripView} */
|
| this._filmStripView = null;
|
| - /** @type {?WebInspector.NetworkPanel.FilmStripRecorder} */
|
| + /** @type {?Network.NetworkPanel.FilmStripRecorder} */
|
| this._filmStripRecorder = null;
|
|
|
| - this._panelToolbar = new WebInspector.Toolbar('', this.element);
|
| - this._filterBar = new WebInspector.FilterBar('networkPanel', true);
|
| + this._panelToolbar = new UI.Toolbar('', this.element);
|
| + this._filterBar = new UI.FilterBar('networkPanel', true);
|
| this._filterBar.show(this.element);
|
|
|
| // Create top overview component.
|
| - this._overviewPane = new WebInspector.TimelineOverviewPane('network');
|
| + this._overviewPane = new UI.TimelineOverviewPane('network');
|
| this._overviewPane.addEventListener(
|
| - WebInspector.TimelineOverviewPane.Events.WindowChanged, this._onWindowChanged.bind(this));
|
| + UI.TimelineOverviewPane.Events.WindowChanged, this._onWindowChanged.bind(this));
|
| this._overviewPane.element.id = 'network-overview-panel';
|
| - this._networkOverview = new WebInspector.NetworkOverview();
|
| + this._networkOverview = new Network.NetworkOverview();
|
| this._overviewPane.setOverviewControls([this._networkOverview]);
|
| - this._calculator = new WebInspector.NetworkTransferTimeCalculator();
|
| + this._calculator = new Network.NetworkTransferTimeCalculator();
|
|
|
| - this._splitWidget = new WebInspector.SplitWidget(true, false, 'networkPanelSplitViewState');
|
| + this._splitWidget = new UI.SplitWidget(true, false, 'networkPanelSplitViewState');
|
| this._splitWidget.hideMain();
|
|
|
| this._splitWidget.show(this.element);
|
| @@ -69,17 +69,17 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| this._progressBarContainer = createElement('div');
|
| this._createToolbarButtons();
|
|
|
| - this._searchableView = new WebInspector.SearchableView(this);
|
| - this._searchableView.setPlaceholder(WebInspector.UIString('Find by filename or path'));
|
| + this._searchableView = new UI.SearchableView(this);
|
| + this._searchableView.setPlaceholder(Common.UIString('Find by filename or path'));
|
|
|
| - /** @type {!WebInspector.NetworkLogView} */
|
| + /** @type {!Network.NetworkLogView} */
|
| this._networkLogView =
|
| - new WebInspector.NetworkLogView(this._filterBar, this._progressBarContainer, this._networkLogLargeRowsSetting);
|
| + new Network.NetworkLogView(this._filterBar, this._progressBarContainer, this._networkLogLargeRowsSetting);
|
| this._networkLogView.show(this._searchableView.element);
|
|
|
| this._splitWidget.setSidebarWidget(this._searchableView);
|
|
|
| - this._detailsWidget = new WebInspector.VBox();
|
| + this._detailsWidget = new UI.VBox();
|
| this._detailsWidget.element.classList.add('network-details-view');
|
| this._splitWidget.setMainWidget(this._detailsWidget);
|
|
|
| @@ -96,44 +96,44 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| this._toggleRecordFilmStrip();
|
| this._updateUI();
|
|
|
| - WebInspector.targetManager.addModelListener(
|
| - WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.Events.WillReloadPage, this._willReloadPage,
|
| + SDK.targetManager.addModelListener(
|
| + SDK.ResourceTreeModel, SDK.ResourceTreeModel.Events.WillReloadPage, this._willReloadPage,
|
| this);
|
| - WebInspector.targetManager.addModelListener(
|
| - WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.Events.Load, this._load, this);
|
| + SDK.targetManager.addModelListener(
|
| + SDK.ResourceTreeModel, SDK.ResourceTreeModel.Events.Load, this._load, this);
|
| this._networkLogView.addEventListener(
|
| - WebInspector.NetworkLogView.Events.RequestSelected, this._onRequestSelected, this);
|
| + Network.NetworkLogView.Events.RequestSelected, this._onRequestSelected, this);
|
| this._networkLogView.addEventListener(
|
| - WebInspector.NetworkLogView.Events.SearchCountUpdated, this._onSearchCountUpdated, this);
|
| + Network.NetworkLogView.Events.SearchCountUpdated, this._onSearchCountUpdated, this);
|
| this._networkLogView.addEventListener(
|
| - WebInspector.NetworkLogView.Events.SearchIndexUpdated, this._onSearchIndexUpdated, this);
|
| + Network.NetworkLogView.Events.SearchIndexUpdated, this._onSearchIndexUpdated, this);
|
| this._networkLogView.addEventListener(
|
| - WebInspector.NetworkLogView.Events.UpdateRequest, this._onUpdateRequest, this);
|
| + Network.NetworkLogView.Events.UpdateRequest, this._onUpdateRequest, this);
|
|
|
| - WebInspector.DataSaverInfobar.maybeShowInPanel(this);
|
| + Components.DataSaverInfobar.maybeShowInPanel(this);
|
| }
|
|
|
| /**
|
| - * @param {!Array<{filterType: !WebInspector.NetworkLogView.FilterType, filterValue: string}>} filters
|
| + * @param {!Array<{filterType: !Network.NetworkLogView.FilterType, filterValue: string}>} filters
|
| */
|
| static revealAndFilter(filters) {
|
| - var panel = WebInspector.NetworkPanel._instance();
|
| + var panel = Network.NetworkPanel._instance();
|
| var filterString = '';
|
| for (var filter of filters)
|
| filterString += `${filter.filterType}:${filter.filterValue} `;
|
| panel._networkLogView.setTextFilterValue(filterString);
|
| - WebInspector.viewManager.showView('network');
|
| + UI.viewManager.showView('network');
|
| }
|
|
|
| /**
|
| - * @return {!WebInspector.NetworkPanel}
|
| + * @return {!Network.NetworkPanel}
|
| */
|
| static _instance() {
|
| - return /** @type {!WebInspector.NetworkPanel} */ (self.runtime.sharedInstance(WebInspector.NetworkPanel));
|
| + return /** @type {!Network.NetworkPanel} */ (self.runtime.sharedInstance(Network.NetworkPanel));
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _onWindowChanged(event) {
|
| var startTime = Math.max(this._calculator.minimumBoundary(), event.data.startTime / 1000);
|
| @@ -142,58 +142,58 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| }
|
|
|
| _createToolbarButtons() {
|
| - this._panelToolbar.appendToolbarItem(WebInspector.Toolbar.createActionButton(this._toggleRecordAction));
|
| + this._panelToolbar.appendToolbarItem(UI.Toolbar.createActionButton(this._toggleRecordAction));
|
|
|
| - this._clearButton = new WebInspector.ToolbarButton(WebInspector.UIString('Clear'), 'largeicon-clear');
|
| + this._clearButton = new UI.ToolbarButton(Common.UIString('Clear'), 'largeicon-clear');
|
| this._clearButton.addEventListener('click', this._onClearButtonClicked, this);
|
| this._panelToolbar.appendToolbarItem(this._clearButton);
|
| this._panelToolbar.appendSeparator();
|
| - var recordFilmStripButton = new WebInspector.ToolbarSettingToggle(
|
| - this._networkRecordFilmStripSetting, 'largeicon-camera', WebInspector.UIString('Capture screenshots'));
|
| + var recordFilmStripButton = new UI.ToolbarSettingToggle(
|
| + this._networkRecordFilmStripSetting, 'largeicon-camera', Common.UIString('Capture screenshots'));
|
| this._panelToolbar.appendToolbarItem(recordFilmStripButton);
|
|
|
| this._panelToolbar.appendToolbarItem(this._filterBar.filterButton());
|
| this._panelToolbar.appendSeparator();
|
|
|
| - this._panelToolbar.appendText(WebInspector.UIString('View:'));
|
| + this._panelToolbar.appendText(Common.UIString('View:'));
|
|
|
| - var largerRequestsButton = new WebInspector.ToolbarSettingToggle(
|
| - this._networkLogLargeRowsSetting, 'largeicon-large-list', WebInspector.UIString('Use large request rows'),
|
| - WebInspector.UIString('Use small request rows'));
|
| + var largerRequestsButton = new UI.ToolbarSettingToggle(
|
| + this._networkLogLargeRowsSetting, 'largeicon-large-list', Common.UIString('Use large request rows'),
|
| + Common.UIString('Use small request rows'));
|
| this._panelToolbar.appendToolbarItem(largerRequestsButton);
|
|
|
| - var showOverviewButton = new WebInspector.ToolbarSettingToggle(
|
| - this._networkLogShowOverviewSetting, 'largeicon-waterfall', WebInspector.UIString('Show overview'),
|
| - WebInspector.UIString('Hide overview'));
|
| + var showOverviewButton = new UI.ToolbarSettingToggle(
|
| + this._networkLogShowOverviewSetting, 'largeicon-waterfall', Common.UIString('Show overview'),
|
| + Common.UIString('Hide overview'));
|
| this._panelToolbar.appendToolbarItem(showOverviewButton);
|
| this._panelToolbar.appendSeparator();
|
|
|
| - this._preserveLogCheckbox = new WebInspector.ToolbarCheckbox(
|
| - WebInspector.UIString('Preserve log'), WebInspector.UIString('Do not clear log on page reload / navigation'));
|
| + this._preserveLogCheckbox = new UI.ToolbarCheckbox(
|
| + Common.UIString('Preserve log'), Common.UIString('Do not clear log on page reload / navigation'));
|
| this._preserveLogCheckbox.inputElement.addEventListener(
|
| 'change', this._onPreserveLogCheckboxChanged.bind(this), false);
|
| this._panelToolbar.appendToolbarItem(this._preserveLogCheckbox);
|
|
|
| - this._disableCacheCheckbox = new WebInspector.ToolbarCheckbox(
|
| - WebInspector.UIString('Disable cache'), WebInspector.UIString('Disable cache (while DevTools is open)'),
|
| - WebInspector.moduleSetting('cacheDisabled'));
|
| + this._disableCacheCheckbox = new UI.ToolbarCheckbox(
|
| + Common.UIString('Disable cache'), Common.UIString('Disable cache (while DevTools is open)'),
|
| + Common.moduleSetting('cacheDisabled'));
|
| this._panelToolbar.appendToolbarItem(this._disableCacheCheckbox);
|
|
|
| this._panelToolbar.appendSeparator();
|
| this._panelToolbar.appendToolbarItem(this._createBlockedURLsButton());
|
| - this._panelToolbar.appendToolbarItem(WebInspector.NetworkConditionsSelector.createOfflineToolbarCheckbox());
|
| + this._panelToolbar.appendToolbarItem(Components.NetworkConditionsSelector.createOfflineToolbarCheckbox());
|
| this._panelToolbar.appendToolbarItem(this._createNetworkConditionsSelect());
|
| - this._panelToolbar.appendToolbarItem(new WebInspector.ToolbarItem(this._progressBarContainer));
|
| + this._panelToolbar.appendToolbarItem(new UI.ToolbarItem(this._progressBarContainer));
|
| }
|
|
|
| /**
|
| - * @return {!WebInspector.ToolbarItem}
|
| + * @return {!UI.ToolbarItem}
|
| */
|
| _createBlockedURLsButton() {
|
| - var setting = WebInspector.moduleSetting('blockedURLs');
|
| + var setting = Common.moduleSetting('blockedURLs');
|
| setting.addChangeListener(updateAction);
|
| - var action = /** @type {!WebInspector.Action }*/ (WebInspector.actionRegistry.action('network.blocked-urls.show'));
|
| - var button = WebInspector.Toolbar.createActionButton(action);
|
| + var action = /** @type {!UI.Action }*/ (UI.actionRegistry.action('network.blocked-urls.show'));
|
| + var button = UI.Toolbar.createActionButton(action);
|
| button.setVisible(Runtime.experiments.isEnabled('requestBlocking'));
|
| updateAction();
|
| return button;
|
| @@ -204,12 +204,12 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| }
|
|
|
| /**
|
| - * @return {!WebInspector.ToolbarComboBox}
|
| + * @return {!UI.ToolbarComboBox}
|
| */
|
| _createNetworkConditionsSelect() {
|
| - var toolbarItem = new WebInspector.ToolbarComboBox(null);
|
| + var toolbarItem = new UI.ToolbarComboBox(null);
|
| toolbarItem.setMaxWidth(140);
|
| - WebInspector.NetworkConditionsSelector.decorateSelect(toolbarItem.selectElement());
|
| + Components.NetworkConditionsSelector.decorateSelect(toolbarItem.selectElement());
|
| return toolbarItem;
|
| }
|
|
|
| @@ -230,7 +230,7 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| }
|
|
|
| /**
|
| - * @param {?WebInspector.FilmStripModel} filmStripModel
|
| + * @param {?Components.FilmStripModel} filmStripModel
|
| */
|
| _filmStripAvailable(filmStripModel) {
|
| if (!filmStripModel)
|
| @@ -241,7 +241,7 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| var timestamps = filmStripModel.frames().map(mapTimestamp);
|
|
|
| /**
|
| - * @param {!WebInspector.FilmStripModel.Frame} frame
|
| + * @param {!Components.FilmStripModel.Frame} frame
|
| * @return {number}
|
| */
|
| function mapTimestamp(frame) {
|
| @@ -259,7 +259,7 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _onClearButtonClicked(event) {
|
| this._reset();
|
| @@ -269,13 +269,13 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| this._calculator.reset();
|
| this._overviewPane.reset();
|
| this._networkLogView.reset();
|
| - WebInspector.BlockedURLsPane.reset();
|
| + Network.BlockedURLsPane.reset();
|
| if (this._filmStripView)
|
| this._resetFilmStripView();
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _willReloadPage(event) {
|
| if (!this._preserveLogCheckbox.checked())
|
| @@ -290,12 +290,12 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _load(event) {
|
| if (this._filmStripRecorder && this._filmStripRecorder.isRecording())
|
| this._pendingStopTimer =
|
| - setTimeout(this._stopFilmStripRecording.bind(this), WebInspector.NetworkPanel.displayScreenshotDelay);
|
| + setTimeout(this._stopFilmStripRecording.bind(this), Network.NetworkPanel.displayScreenshotDelay);
|
| }
|
|
|
| _stopFilmStripRecording() {
|
| @@ -319,16 +319,16 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| _toggleRecordFilmStrip() {
|
| var toggled = this._networkRecordFilmStripSetting.get();
|
| if (toggled && !this._filmStripRecorder) {
|
| - this._filmStripView = new WebInspector.FilmStripView();
|
| - this._filmStripView.setMode(WebInspector.FilmStripView.Modes.FrameBased);
|
| + this._filmStripView = new Components.FilmStripView();
|
| + this._filmStripView.setMode(Components.FilmStripView.Modes.FrameBased);
|
| this._filmStripView.element.classList.add('network-film-strip');
|
| this._filmStripRecorder =
|
| - new WebInspector.NetworkPanel.FilmStripRecorder(this._networkLogView.timeCalculator(), this._filmStripView);
|
| + new Network.NetworkPanel.FilmStripRecorder(this._networkLogView.timeCalculator(), this._filmStripView);
|
| this._filmStripView.show(this.element, this.element.firstElementChild);
|
| this._filmStripView.addEventListener(
|
| - WebInspector.FilmStripView.Events.FrameSelected, this._onFilmFrameSelected, this);
|
| - this._filmStripView.addEventListener(WebInspector.FilmStripView.Events.FrameEnter, this._onFilmFrameEnter, this);
|
| - this._filmStripView.addEventListener(WebInspector.FilmStripView.Events.FrameExit, this._onFilmFrameExit, this);
|
| + Components.FilmStripView.Events.FrameSelected, this._onFilmFrameSelected, this);
|
| + this._filmStripView.addEventListener(Components.FilmStripView.Events.FrameEnter, this._onFilmFrameEnter, this);
|
| + this._filmStripView.addEventListener(Components.FilmStripView.Events.FrameExit, this._onFilmFrameExit, this);
|
| this._resetFilmStripView();
|
| }
|
|
|
| @@ -341,9 +341,9 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
|
|
| _resetFilmStripView() {
|
| this._filmStripView.reset();
|
| - this._filmStripView.setStatusText(WebInspector.UIString(
|
| + this._filmStripView.setStatusText(Common.UIString(
|
| 'Hit %s to reload and capture filmstrip.',
|
| - WebInspector.shortcutRegistry.shortcutDescriptorsForAction('main.reload')[0].name));
|
| + UI.shortcutRegistry.shortcutDescriptorsForAction('main.reload')[0].name));
|
| }
|
|
|
| /**
|
| @@ -356,7 +356,7 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
|
|
| /**
|
| * @override
|
| - * @return {!WebInspector.SearchableView}
|
| + * @return {!UI.SearchableView}
|
| */
|
| searchableView() {
|
| return this._searchableView;
|
| @@ -367,7 +367,7 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| * @param {!KeyboardEvent} event
|
| */
|
| handleShortcut(event) {
|
| - if (this._networkItemView && event.keyCode === WebInspector.KeyboardShortcut.Keys.Esc.code) {
|
| + if (this._networkItemView && event.keyCode === UI.KeyboardShortcut.Keys.Esc.code) {
|
| this._showRequest(null);
|
| event.handled = true;
|
| return;
|
| @@ -380,18 +380,18 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| * @override
|
| */
|
| wasShown() {
|
| - WebInspector.context.setFlavor(WebInspector.NetworkPanel, this);
|
| + UI.context.setFlavor(Network.NetworkPanel, this);
|
| }
|
|
|
| /**
|
| * @override
|
| */
|
| willHide() {
|
| - WebInspector.context.setFlavor(WebInspector.NetworkPanel, null);
|
| + UI.context.setFlavor(Network.NetworkPanel, null);
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.NetworkRequest} request
|
| + * @param {!SDK.NetworkRequest} request
|
| */
|
| revealAndHighlightRequest(request) {
|
| this._showRequest(null);
|
| @@ -400,14 +400,14 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _onRowSizeChanged(event) {
|
| this._updateUI();
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _onSearchCountUpdated(event) {
|
| var count = /** @type {number} */ (event.data);
|
| @@ -415,7 +415,7 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _onSearchIndexUpdated(event) {
|
| var index = /** @type {number} */ (event.data);
|
| @@ -423,15 +423,15 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _onRequestSelected(event) {
|
| - var request = /** @type {?WebInspector.NetworkRequest} */ (event.data);
|
| + var request = /** @type {?SDK.NetworkRequest} */ (event.data);
|
| this._showRequest(request);
|
| }
|
|
|
| /**
|
| - * @param {?WebInspector.NetworkRequest} request
|
| + * @param {?SDK.NetworkRequest} request
|
| */
|
| _showRequest(request) {
|
| if (this._networkItemView) {
|
| @@ -440,8 +440,8 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| }
|
|
|
| if (request) {
|
| - this._networkItemView = new WebInspector.NetworkItemView(request, this._networkLogView.timeCalculator());
|
| - this._networkItemView.leftToolbar().appendToolbarItem(new WebInspector.ToolbarItem(this._closeButtonElement));
|
| + this._networkItemView = new Network.NetworkItemView(request, this._networkLogView.timeCalculator());
|
| + this._networkItemView.leftToolbar().appendToolbarItem(new UI.ToolbarItem(this._closeButtonElement));
|
| this._networkItemView.show(this._detailsWidget.element);
|
| this._splitWidget.showBoth();
|
| } else {
|
| @@ -459,7 +459,7 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
|
|
| /**
|
| * @override
|
| - * @param {!WebInspector.SearchableView.SearchConfig} searchConfig
|
| + * @param {!UI.SearchableView.SearchConfig} searchConfig
|
| * @param {boolean} shouldJump
|
| * @param {boolean=} jumpBackwards
|
| */
|
| @@ -507,45 +507,45 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| /**
|
| * @override
|
| * @param {!Event} event
|
| - * @param {!WebInspector.ContextMenu} contextMenu
|
| + * @param {!UI.ContextMenu} contextMenu
|
| * @param {!Object} target
|
| - * @this {WebInspector.NetworkPanel}
|
| + * @this {Network.NetworkPanel}
|
| */
|
| appendApplicableItems(event, contextMenu, target) {
|
| /**
|
| - * @this {WebInspector.NetworkPanel}
|
| + * @this {Network.NetworkPanel}
|
| */
|
| function reveal(request) {
|
| - WebInspector.viewManager.showView('network').then(this.revealAndHighlightRequest.bind(this, request));
|
| + UI.viewManager.showView('network').then(this.revealAndHighlightRequest.bind(this, request));
|
| }
|
|
|
| /**
|
| - * @this {WebInspector.NetworkPanel}
|
| + * @this {Network.NetworkPanel}
|
| */
|
| function appendRevealItem(request) {
|
| - contextMenu.appendItem(WebInspector.UIString.capitalize('Reveal in Network ^panel'), reveal.bind(this, request));
|
| + contextMenu.appendItem(Common.UIString.capitalize('Reveal in Network ^panel'), reveal.bind(this, request));
|
| }
|
|
|
| if (event.target.isSelfOrDescendant(this.element))
|
| return;
|
|
|
| - if (target instanceof WebInspector.Resource) {
|
| - var resource = /** @type {!WebInspector.Resource} */ (target);
|
| + if (target instanceof SDK.Resource) {
|
| + var resource = /** @type {!SDK.Resource} */ (target);
|
| if (resource.request)
|
| appendRevealItem.call(this, resource.request);
|
| return;
|
| }
|
| - if (target instanceof WebInspector.UISourceCode) {
|
| - var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (target);
|
| - var resource = WebInspector.resourceForURL(uiSourceCode.url());
|
| + if (target instanceof Workspace.UISourceCode) {
|
| + var uiSourceCode = /** @type {!Workspace.UISourceCode} */ (target);
|
| + var resource = Bindings.resourceForURL(uiSourceCode.url());
|
| if (resource && resource.request)
|
| appendRevealItem.call(this, resource.request);
|
| return;
|
| }
|
|
|
| - if (!(target instanceof WebInspector.NetworkRequest))
|
| + if (!(target instanceof SDK.NetworkRequest))
|
| return;
|
| - var request = /** @type {!WebInspector.NetworkRequest} */ (target);
|
| + var request = /** @type {!SDK.NetworkRequest} */ (target);
|
| if (this._networkItemView && this._networkItemView.isShowing() && this._networkItemView.request() === request)
|
| return;
|
|
|
| @@ -553,7 +553,7 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _onFilmFrameSelected(event) {
|
| var timestamp = /** @type {number} */ (event.data);
|
| @@ -561,7 +561,7 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _onFilmFrameEnter(event) {
|
| var timestamp = /** @type {number} */ (event.data);
|
| @@ -570,7 +570,7 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _onFilmFrameExit(event) {
|
| this._networkOverview.clearFilmStripFrame();
|
| @@ -578,10 +578,10 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _onUpdateRequest(event) {
|
| - var request = /** @type {!WebInspector.NetworkRequest} */ (event.data);
|
| + var request = /** @type {!SDK.NetworkRequest} */ (event.data);
|
| this._calculator.updateBoundaries(request);
|
| // FIXME: Unify all time units across the frontend!
|
| this._overviewPane.setBounds(this._calculator.minimumBoundary() * 1000, this._calculator.maximumBoundary() * 1000);
|
| @@ -590,51 +590,51 @@ WebInspector.NetworkPanel = class extends WebInspector.Panel {
|
| }
|
| };
|
|
|
| -WebInspector.NetworkPanel.displayScreenshotDelay = 1000;
|
| +Network.NetworkPanel.displayScreenshotDelay = 1000;
|
|
|
| /**
|
| - * @implements {WebInspector.ContextMenu.Provider}
|
| + * @implements {UI.ContextMenu.Provider}
|
| * @unrestricted
|
| */
|
| -WebInspector.NetworkPanel.ContextMenuProvider = class {
|
| +Network.NetworkPanel.ContextMenuProvider = class {
|
| /**
|
| * @override
|
| * @param {!Event} event
|
| - * @param {!WebInspector.ContextMenu} contextMenu
|
| + * @param {!UI.ContextMenu} contextMenu
|
| * @param {!Object} target
|
| */
|
| appendApplicableItems(event, contextMenu, target) {
|
| - WebInspector.NetworkPanel._instance().appendApplicableItems(event, contextMenu, target);
|
| + Network.NetworkPanel._instance().appendApplicableItems(event, contextMenu, target);
|
| }
|
| };
|
|
|
| /**
|
| - * @implements {WebInspector.Revealer}
|
| + * @implements {Common.Revealer}
|
| * @unrestricted
|
| */
|
| -WebInspector.NetworkPanel.RequestRevealer = class {
|
| +Network.NetworkPanel.RequestRevealer = class {
|
| /**
|
| * @override
|
| * @param {!Object} request
|
| * @return {!Promise}
|
| */
|
| reveal(request) {
|
| - if (!(request instanceof WebInspector.NetworkRequest))
|
| + if (!(request instanceof SDK.NetworkRequest))
|
| return Promise.reject(new Error('Internal error: not a network request'));
|
| - var panel = WebInspector.NetworkPanel._instance();
|
| - return WebInspector.viewManager.showView('network').then(panel.revealAndHighlightRequest.bind(panel, request));
|
| + var panel = Network.NetworkPanel._instance();
|
| + return UI.viewManager.showView('network').then(panel.revealAndHighlightRequest.bind(panel, request));
|
| }
|
| };
|
|
|
|
|
| /**
|
| - * @implements {WebInspector.TracingManagerClient}
|
| + * @implements {SDK.TracingManagerClient}
|
| * @unrestricted
|
| */
|
| -WebInspector.NetworkPanel.FilmStripRecorder = class {
|
| +Network.NetworkPanel.FilmStripRecorder = class {
|
| /**
|
| - * @param {!WebInspector.NetworkTimeCalculator} timeCalculator
|
| - * @param {!WebInspector.FilmStripView} filmStripView
|
| + * @param {!Network.NetworkTimeCalculator} timeCalculator
|
| + * @param {!Components.FilmStripView} filmStripView
|
| */
|
| constructor(timeCalculator, filmStripView) {
|
| this._timeCalculator = timeCalculator;
|
| @@ -649,7 +649,7 @@ WebInspector.NetworkPanel.FilmStripRecorder = class {
|
|
|
| /**
|
| * @override
|
| - * @param {!Array.<!WebInspector.TracingManager.EventPayload>} events
|
| + * @param {!Array.<!SDK.TracingManager.EventPayload>} events
|
| */
|
| traceEventsCollected(events) {
|
| if (this._tracingModel)
|
| @@ -663,9 +663,9 @@ WebInspector.NetworkPanel.FilmStripRecorder = class {
|
| if (!this._tracingModel)
|
| return;
|
| this._tracingModel.tracingComplete();
|
| - WebInspector.targetManager.resumeReload(this._target);
|
| + SDK.targetManager.resumeReload(this._target);
|
| this._target = null;
|
| - this._callback(new WebInspector.FilmStripModel(this._tracingModel, this._timeCalculator.minimumBoundary() * 1000));
|
| + this._callback(new Components.FilmStripModel(this._tracingModel, this._timeCalculator.minimumBoundary() * 1000));
|
| delete this._callback;
|
| }
|
|
|
| @@ -684,15 +684,15 @@ WebInspector.NetworkPanel.FilmStripRecorder = class {
|
|
|
| startRecording() {
|
| this._filmStripView.reset();
|
| - this._filmStripView.setStatusText(WebInspector.UIString('Recording frames...'));
|
| + this._filmStripView.setStatusText(Common.UIString('Recording frames...'));
|
| if (this._target)
|
| return;
|
|
|
| - this._target = WebInspector.targetManager.mainTarget();
|
| + this._target = SDK.targetManager.mainTarget();
|
| if (this._tracingModel)
|
| this._tracingModel.reset();
|
| else
|
| - this._tracingModel = new WebInspector.TracingModel(new WebInspector.TempFileBackingStorage('tracing'));
|
| + this._tracingModel = new SDK.TracingModel(new Bindings.TempFileBackingStorage('tracing'));
|
| this._target.tracingManager.start(this, '-*,disabled-by-default-devtools.screenshot', '');
|
| }
|
|
|
| @@ -704,33 +704,33 @@ WebInspector.NetworkPanel.FilmStripRecorder = class {
|
| }
|
|
|
| /**
|
| - * @param {function(?WebInspector.FilmStripModel)} callback
|
| + * @param {function(?Components.FilmStripModel)} callback
|
| */
|
| stopRecording(callback) {
|
| if (!this._target)
|
| return;
|
|
|
| this._target.tracingManager.stop();
|
| - WebInspector.targetManager.suspendReload(this._target);
|
| + SDK.targetManager.suspendReload(this._target);
|
| this._callback = callback;
|
| - this._filmStripView.setStatusText(WebInspector.UIString('Fetching frames...'));
|
| + this._filmStripView.setStatusText(Common.UIString('Fetching frames...'));
|
| }
|
| };
|
|
|
| /**
|
| - * @implements {WebInspector.ActionDelegate}
|
| + * @implements {UI.ActionDelegate}
|
| * @unrestricted
|
| */
|
| -WebInspector.NetworkPanel.RecordActionDelegate = class {
|
| +Network.NetworkPanel.RecordActionDelegate = class {
|
| /**
|
| * @override
|
| - * @param {!WebInspector.Context} context
|
| + * @param {!UI.Context} context
|
| * @param {string} actionId
|
| * @return {boolean}
|
| */
|
| handleAction(context, actionId) {
|
| - var panel = WebInspector.context.flavor(WebInspector.NetworkPanel);
|
| - console.assert(panel && panel instanceof WebInspector.NetworkPanel);
|
| + var panel = UI.context.flavor(Network.NetworkPanel);
|
| + console.assert(panel && panel instanceof Network.NetworkPanel);
|
| panel._toggleRecording();
|
| return true;
|
| }
|
|
|