[global] Remaps self.SDK.targetManager
This CL changes references to self.SDK.targetManager (the global
instance of SDK.SDKModel.TargetManager) over to
SDK.SDKModel.TargetManager.instance(). To keep both TypeScript and
Closure happy we must make a method on the TargetManager class itself,
since it only allows private constructors to be accessed by static
methods on the class.
Bug: 1058320
Change-Id: I6ca35024c21cf24254fd6273138a1ab3e163ee00
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2088092
Commit-Queue: Paul Lewis <[email protected]>
Reviewed-by: Tim van der Lippe <[email protected]>
diff --git a/front_end/network/BlockedURLsPane.js b/front_end/network/BlockedURLsPane.js
index 948ec79..b269d9cc 100644
--- a/front_end/network/BlockedURLsPane.js
+++ b/front_end/network/BlockedURLsPane.js
@@ -47,7 +47,7 @@
/** @type {!Map<string, number>} */
this._blockedCountForUrl = new Map();
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.NetworkManager.NetworkManager, SDK.NetworkManager.Events.RequestFinished, this._onRequestFinished, this);
this._updateThrottler = new Common.Throttler.Throttler(200);
diff --git a/front_end/network/NetworkLogView.js b/front_end/network/NetworkLogView.js
index 53bd66a..48804d6 100644
--- a/front_end/network/NetworkLogView.js
+++ b/front_end/network/NetworkLogView.js
@@ -186,7 +186,7 @@
self.Common.settings.moduleSetting('networkColorCodeResourceTypes')
.addChangeListener(this._invalidateAllItems.bind(this, false), this);
- self.SDK.targetManager.observeModels(SDK.NetworkManager.NetworkManager, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.NetworkManager.NetworkManager, this);
self.SDK.networkLog.addEventListener(SDK.NetworkLog.Events.RequestAdded, this._onRequestUpdated, this);
self.SDK.networkLog.addEventListener(SDK.NetworkLog.Events.RequestUpdated, this._onRequestUpdated, this);
self.SDK.networkLog.addEventListener(SDK.NetworkLog.Events.Reset, this._reset, this);
@@ -1520,7 +1520,7 @@
* @return {!Promise}
*/
async exportAll() {
- const url = self.SDK.targetManager.mainTarget().inspectedURL();
+ const url = SDK.SDKModel.TargetManager.instance().mainTarget().inspectedURL();
const parsedURL = Common.ParsedURL.ParsedURL.fromString(url);
const filename = parsedURL ? parsedURL.host : 'network-log';
const stream = new Bindings.FileUtils.FileOutputStream();
diff --git a/front_end/network/NetworkOverview.js b/front_end/network/NetworkOverview.js
index 62468ba..099c77e 100644
--- a/front_end/network/NetworkOverview.js
+++ b/front_end/network/NetworkOverview.js
@@ -25,9 +25,9 @@
this._updateScheduled = false;
this._highlightedRequest = null;
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.Load, this._loadEventFired, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.DOMContentLoaded,
this._domContentLoadedEventFired, this);
diff --git a/front_end/network/NetworkPanel.js b/front_end/network/NetworkPanel.js
index 9bab39c..49301e7 100644
--- a/front_end/network/NetworkPanel.js
+++ b/front_end/network/NetworkPanel.js
@@ -170,10 +170,10 @@
this._toggleRecordFilmStrip();
this._updateUI();
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.WillReloadPage, this._willReloadPage,
this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.Load, this._load, this);
this._networkLogView.addEventListener(Events.RequestSelected, this._onRequestSelected, this);
this._networkLogView.addEventListener(Events.RequestActivated, this._onRequestActivated, this);
@@ -767,7 +767,7 @@
startRecording() {
this._filmStripView.reset();
this._filmStripView.setStatusText(Common.UIString.UIString('Recording frames...'));
- const tracingManagers = self.SDK.targetManager.models(SDK.TracingManager.TracingManager);
+ const tracingManagers = SDK.SDKModel.TargetManager.instance().models(SDK.TracingManager.TracingManager);
if (this._tracingManager || !tracingManagers.length) {
return;
}
