Clean up after ESM migration of front_end/web_audio
This CL cleans up some residues of internal dependencies
in front_end/web_audio. (e.g. shortening global variables to local,
adding proper import {} syntax)
Bug: 1040646
Change-Id: I567f7e8dc32369f855e4cac3130e24b674bd0eca
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2001229
Commit-Queue: Hongchan Choi <[email protected]>
Reviewed-by: Paul Lewis <[email protected]>
diff --git a/front_end/web_audio/WebAudioView.js b/front_end/web_audio/WebAudioView.js
index fb456a9..7dba4cc 100644
--- a/front_end/web_audio/WebAudioView.js
+++ b/front_end/web_audio/WebAudioView.js
@@ -2,8 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import {ContextDetailBuilder, ContextSummaryBuilder} from './AudioContextContentBuilder.js';
+import {AudioContextSelector, Events as SelectorEvents} from './AudioContextSelector.js';
+import {GraphManager} from './graph_visualizer/GraphManager.js';
+import {Events as ModelEvents, WebAudioModel} from './WebAudioModel.js';
+
/**
- * @implements {SDK.SDKModelObserver<!WebAudio.WebAudioModel>}
+ * @implements {SDK.SDKModelObserver<!WebAudioModel>}
*/
export class WebAudioView extends UI.ThrottledWidget {
constructor() {
@@ -12,9 +17,8 @@
this.registerRequiredCSS('web_audio/webAudio.css');
// Creates the toolbar.
- const toolbarContainer = this.contentElement.createChild(
- 'div', 'web-audio-toolbar-container vbox');
- this._contextSelector = new WebAudio.AudioContextSelector();
+ const toolbarContainer = this.contentElement.createChild('div', 'web-audio-toolbar-container vbox');
+ this._contextSelector = new AudioContextSelector();
const toolbar = new UI.Toolbar('web-audio-toolbar', toolbarContainer);
toolbar.appendToolbarItem(UI.Toolbar.createActionButtonForId('components.collect-garbage'));
toolbar.appendSeparator();
@@ -23,7 +27,7 @@
// Creates the detail view.
this._detailViewContainer = this.contentElement.createChild('div', 'vbox flex-auto');
- this._graphManager = new WebAudio.GraphVisualizer.GraphManager();
+ this._graphManager = new GraphManager();
// Creates the landing page.
this._landingPage = new UI.VBox();
@@ -38,14 +42,14 @@
// Creates the summary bar.
this._summaryBarContainer = this.contentElement.createChild('div', 'web-audio-summary-container');
- this._contextSelector.addEventListener(WebAudio.AudioContextSelector.Events.ContextSelected, event => {
+ this._contextSelector.addEventListener(SelectorEvents.ContextSelected, event => {
const context =
/** @type {!Protocol.WebAudio.BaseAudioContext} */ (event.data);
this._updateDetailView(context);
this.doUpdate();
});
- SDK.targetManager.observeModels(WebAudio.WebAudioModel, this);
+ SDK.targetManager.observeModels(WebAudioModel, this);
}
/**
@@ -53,7 +57,7 @@
*/
wasShown() {
super.wasShown();
- for (const model of SDK.targetManager.models(WebAudio.WebAudioModel)) {
+ for (const model of SDK.targetManager.models(WebAudioModel)) {
this._addEventListeners(model);
}
}
@@ -62,14 +66,14 @@
* @override
*/
willHide() {
- for (const model of SDK.targetManager.models(WebAudio.WebAudioModel)) {
+ for (const model of SDK.targetManager.models(WebAudioModel)) {
this._removeEventListeners(model);
}
}
/**
* @override
- * @param {!WebAudio.WebAudioModel} webAudioModel
+ * @param {!WebAudioModel} webAudioModel
*/
modelAdded(webAudioModel) {
if (this.isShowing()) {
@@ -79,7 +83,7 @@
/**
* @override
- * @param {!WebAudio.WebAudioModel} webAudioModel
+ * @param {!WebAudioModel} webAudioModel
*/
modelRemoved(webAudioModel) {
this._removeEventListeners(webAudioModel);
@@ -95,56 +99,47 @@
}
/**
- * @param {!WebAudio.WebAudioModel} webAudioModel
+ * @param {!WebAudioModel} webAudioModel
*/
_addEventListeners(webAudioModel) {
webAudioModel.ensureEnabled();
- webAudioModel.addEventListener(WebAudio.WebAudioModel.Events.ContextCreated, this._contextCreated, this);
- webAudioModel.addEventListener(WebAudio.WebAudioModel.Events.ContextDestroyed, this._contextDestroyed, this);
- webAudioModel.addEventListener(WebAudio.WebAudioModel.Events.ContextChanged, this._contextChanged, this);
- webAudioModel.addEventListener(WebAudio.WebAudioModel.Events.ModelReset, this._reset, this);
- webAudioModel.addEventListener(WebAudio.WebAudioModel.Events.ModelSuspend, this._suspendModel, this);
- webAudioModel.addEventListener(
- WebAudio.WebAudioModel.Events.AudioListenerCreated, this._audioListenerCreated, this);
- webAudioModel.addEventListener(
- WebAudio.WebAudioModel.Events.AudioListenerWillBeDestroyed, this._audioListenerWillBeDestroyed, this);
- webAudioModel.addEventListener(WebAudio.WebAudioModel.Events.AudioNodeCreated, this._audioNodeCreated, this);
- webAudioModel.addEventListener(
- WebAudio.WebAudioModel.Events.AudioNodeWillBeDestroyed, this._audioNodeWillBeDestroyed, this);
- webAudioModel.addEventListener(WebAudio.WebAudioModel.Events.AudioParamCreated, this._audioParamCreated, this);
- webAudioModel.addEventListener(
- WebAudio.WebAudioModel.Events.AudioParamWillBeDestroyed, this._audioParamWillBeDestroyed, this);
- webAudioModel.addEventListener(WebAudio.WebAudioModel.Events.NodesConnected, this._nodesConnected, this);
- webAudioModel.addEventListener(WebAudio.WebAudioModel.Events.NodesDisconnected, this._nodesDisconnected, this);
- webAudioModel.addEventListener(WebAudio.WebAudioModel.Events.NodeParamConnected, this._nodeParamConnected, this);
- webAudioModel.addEventListener(
- WebAudio.WebAudioModel.Events.NodeParamDisconnected, this._nodeParamDisconnected, this);
+ webAudioModel.addEventListener(ModelEvents.ContextCreated, this._contextCreated, this);
+ webAudioModel.addEventListener(ModelEvents.ContextDestroyed, this._contextDestroyed, this);
+ webAudioModel.addEventListener(ModelEvents.ContextChanged, this._contextChanged, this);
+ webAudioModel.addEventListener(ModelEvents.ModelReset, this._reset, this);
+ webAudioModel.addEventListener(ModelEvents.ModelSuspend, this._suspendModel, this);
+ webAudioModel.addEventListener(ModelEvents.AudioListenerCreated, this._audioListenerCreated, this);
+ webAudioModel.addEventListener(ModelEvents.AudioListenerWillBeDestroyed, this._audioListenerWillBeDestroyed, this);
+ webAudioModel.addEventListener(ModelEvents.AudioNodeCreated, this._audioNodeCreated, this);
+ webAudioModel.addEventListener(ModelEvents.AudioNodeWillBeDestroyed, this._audioNodeWillBeDestroyed, this);
+ webAudioModel.addEventListener(ModelEvents.AudioParamCreated, this._audioParamCreated, this);
+ webAudioModel.addEventListener(ModelEvents.AudioParamWillBeDestroyed, this._audioParamWillBeDestroyed, this);
+ webAudioModel.addEventListener(ModelEvents.NodesConnected, this._nodesConnected, this);
+ webAudioModel.addEventListener(ModelEvents.NodesDisconnected, this._nodesDisconnected, this);
+ webAudioModel.addEventListener(ModelEvents.NodeParamConnected, this._nodeParamConnected, this);
+ webAudioModel.addEventListener(ModelEvents.NodeParamDisconnected, this._nodeParamDisconnected, this);
}
/**
* @param {!WebAudio.WebAudioModel} webAudioModel
*/
_removeEventListeners(webAudioModel) {
- webAudioModel.removeEventListener(WebAudio.WebAudioModel.Events.ContextCreated, this._contextCreated, this);
- webAudioModel.removeEventListener(WebAudio.WebAudioModel.Events.ContextDestroyed, this._contextDestroyed, this);
- webAudioModel.removeEventListener(WebAudio.WebAudioModel.Events.ContextChanged, this._contextChanged, this);
- webAudioModel.removeEventListener(WebAudio.WebAudioModel.Events.ModelReset, this._reset, this);
- webAudioModel.removeEventListener(WebAudio.WebAudioModel.Events.ModelSuspend, this._suspendModel, this);
+ webAudioModel.removeEventListener(ModelEvents.ContextCreated, this._contextCreated, this);
+ webAudioModel.removeEventListener(ModelEvents.ContextDestroyed, this._contextDestroyed, this);
+ webAudioModel.removeEventListener(ModelEvents.ContextChanged, this._contextChanged, this);
+ webAudioModel.removeEventListener(ModelEvents.ModelReset, this._reset, this);
+ webAudioModel.removeEventListener(ModelEvents.ModelSuspend, this._suspendModel, this);
+ webAudioModel.removeEventListener(ModelEvents.AudioListenerCreated, this._audioListenerCreated, this);
webAudioModel.removeEventListener(
- WebAudio.WebAudioModel.Events.AudioListenerCreated, this._audioListenerCreated, this);
- webAudioModel.removeEventListener(
- WebAudio.WebAudioModel.Events.AudioListenerWillBeDestroyed, this._audioListenerWillBeDestroyed, this);
- webAudioModel.removeEventListener(WebAudio.WebAudioModel.Events.AudioNodeCreated, this._audioNodeCreated, this);
- webAudioModel.removeEventListener(
- WebAudio.WebAudioModel.Events.AudioNodeWillBeDestroyed, this._audioNodeWillBeDestroyed, this);
- webAudioModel.removeEventListener(WebAudio.WebAudioModel.Events.AudioParamCreated, this._audioParamCreated, this);
- webAudioModel.removeEventListener(
- WebAudio.WebAudioModel.Events.AudioParamWillBeDestroyed, this._audioParamWillBeDestroyed, this);
- webAudioModel.removeEventListener(WebAudio.WebAudioModel.Events.NodesConnected, this._nodesConnected, this);
- webAudioModel.removeEventListener(WebAudio.WebAudioModel.Events.NodesDisconnected, this._nodesDisconnected, this);
- webAudioModel.removeEventListener(WebAudio.WebAudioModel.Events.NodeParamConnected, this._nodeParamConnected, this);
- webAudioModel.removeEventListener(
- WebAudio.WebAudioModel.Events.NodeParamDisconnected, this._nodeParamDisconnected, this);
+ ModelEvents.AudioListenerWillBeDestroyed, this._audioListenerWillBeDestroyed, this);
+ webAudioModel.removeEventListener(ModelEvents.AudioNodeCreated, this._audioNodeCreated, this);
+ webAudioModel.removeEventListener(ModelEvents.AudioNodeWillBeDestroyed, this._audioNodeWillBeDestroyed, this);
+ webAudioModel.removeEventListener(ModelEvents.AudioParamCreated, this._audioParamCreated, this);
+ webAudioModel.removeEventListener(ModelEvents.AudioParamWillBeDestroyed, this._audioParamWillBeDestroyed, this);
+ webAudioModel.removeEventListener(ModelEvents.NodesConnected, this._nodesConnected, this);
+ webAudioModel.removeEventListener(ModelEvents.NodesDisconnected, this._nodesDisconnected, this);
+ webAudioModel.removeEventListener(ModelEvents.NodeParamConnected, this._nodeParamConnected, this);
+ webAudioModel.removeEventListener(ModelEvents.NodeParamDisconnected, this._nodeParamDisconnected, this);
}
/**
@@ -364,7 +359,7 @@
if (this._landingPage.isShowing()) {
this._landingPage.detach();
}
- const detailBuilder = new WebAudio.ContextDetailBuilder(context);
+ const detailBuilder = new ContextDetailBuilder(context);
this._detailViewContainer.removeChildren();
this._detailViewContainer.appendChild(detailBuilder.getFragment());
}
@@ -374,8 +369,7 @@
* @param {!Protocol.WebAudio.ContextRealtimeData} contextRealtimeData
*/
_updateSummaryBar(contextId, contextRealtimeData) {
- const summaryBuilder =
- new WebAudio.AudioContextSummaryBuilder(contextId, contextRealtimeData);
+ const summaryBuilder = new ContextSummaryBuilder(contextId, contextRealtimeData);
this._summaryBarContainer.removeChildren();
this._summaryBarContainer.appendChild(summaryBuilder.getFragment());
}
