[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/accessibility/AccessibilitySidebarView.js b/front_end/accessibility/AccessibilitySidebarView.js
index 6bd8d83..67e538b 100644
--- a/front_end/accessibility/AccessibilitySidebarView.js
+++ b/front_end/accessibility/AccessibilitySidebarView.js
@@ -109,13 +109,13 @@
// Pull down the latest date for this node.
this.doUpdate();
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DOMModel.DOMModel, SDK.DOMModel.Events.AttrModified, this._onAttrChange, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DOMModel.DOMModel, SDK.DOMModel.Events.AttrRemoved, this._onAttrChange, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DOMModel.DOMModel, SDK.DOMModel.Events.CharacterDataModified, this._onNodeChange, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DOMModel.DOMModel, SDK.DOMModel.Events.ChildNodeCountUpdated, this._onNodeChange, this);
}
@@ -123,13 +123,13 @@
* @override
*/
willHide() {
- self.SDK.targetManager.removeModelListener(
+ SDK.SDKModel.TargetManager.instance().removeModelListener(
SDK.DOMModel.DOMModel, SDK.DOMModel.Events.AttrModified, this._onAttrChange, this);
- self.SDK.targetManager.removeModelListener(
+ SDK.SDKModel.TargetManager.instance().removeModelListener(
SDK.DOMModel.DOMModel, SDK.DOMModel.Events.AttrRemoved, this._onAttrChange, this);
- self.SDK.targetManager.removeModelListener(
+ SDK.SDKModel.TargetManager.instance().removeModelListener(
SDK.DOMModel.DOMModel, SDK.DOMModel.Events.CharacterDataModified, this._onNodeChange, this);
- self.SDK.targetManager.removeModelListener(
+ SDK.SDKModel.TargetManager.instance().removeModelListener(
SDK.DOMModel.DOMModel, SDK.DOMModel.Events.ChildNodeCountUpdated, this._onNodeChange, this);
}
diff --git a/front_end/animation/AnimationTimeline.js b/front_end/animation/AnimationTimeline.js
index 8ee7288..4fc85dd 100644
--- a/front_end/animation/AnimationTimeline.js
+++ b/front_end/animation/AnimationTimeline.js
@@ -43,9 +43,9 @@
this._symbol = Symbol('animationTimeline');
/** @type {!Map.<string, !AnimationImpl>} */
this._animationsMap = new Map();
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DOMModel.DOMModel, SDK.DOMModel.Events.NodeRemoved, this._nodeRemoved, this);
- self.SDK.targetManager.observeModels(AnimationModel, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(AnimationModel, this);
self.UI.context.addFlavorChangeListener(SDK.DOMModel.DOMNode, this._nodeChanged, this);
}
@@ -53,7 +53,7 @@
* @override
*/
wasShown() {
- for (const animationModel of self.SDK.targetManager.models(AnimationModel)) {
+ for (const animationModel of SDK.SDKModel.TargetManager.instance().models(AnimationModel)) {
this._addEventListeners(animationModel);
}
}
@@ -62,7 +62,7 @@
* @override
*/
willHide() {
- for (const animationModel of self.SDK.targetManager.models(AnimationModel)) {
+ for (const animationModel of SDK.SDKModel.TargetManager.instance().models(AnimationModel)) {
this._removeEventListeners(animationModel);
}
this._popoverHelper.hidePopover();
@@ -272,7 +272,7 @@
*/
_setPlaybackRate(playbackRate) {
this._playbackRate = playbackRate;
- for (const animationModel of self.SDK.targetManager.models(AnimationModel)) {
+ for (const animationModel of SDK.SDKModel.TargetManager.instance().models(AnimationModel)) {
animationModel.setPlaybackRate(this._allPaused ? 0 : this._playbackRate);
}
Host.userMetrics.actionTaken(Host.UserMetrics.Action.AnimationsPlaybackRateChanged);
diff --git a/front_end/bindings/BlackboxManager.js b/front_end/bindings/BlackboxManager.js
index 78867a3..549af69 100644
--- a/front_end/bindings/BlackboxManager.js
+++ b/front_end/bindings/BlackboxManager.js
@@ -19,7 +19,7 @@
constructor(debuggerWorkspaceBinding) {
this._debuggerWorkspaceBinding = debuggerWorkspaceBinding;
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DebuggerModel.DebuggerModel, SDK.DebuggerModel.Events.GlobalObjectCleared,
this._clearCacheIfNeeded.bind(this), this);
self.Common.settings.moduleSetting('skipStackFramesPattern').addChangeListener(this._patternChanged.bind(this));
@@ -31,7 +31,7 @@
/** @type {!Map<string, boolean>} */
this._isBlackboxedURLCache = new Map();
- self.SDK.targetManager.observeModels(SDK.DebuggerModel.DebuggerModel, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.DebuggerModel.DebuggerModel, this);
}
/**
@@ -298,7 +298,7 @@
/** @type {!Array<!Promise>} */
const promises = [];
- for (const debuggerModel of self.SDK.targetManager.models(SDK.DebuggerModel.DebuggerModel)) {
+ for (const debuggerModel of SDK.SDKModel.TargetManager.instance().models(SDK.DebuggerModel.DebuggerModel)) {
promises.push(this._setBlackboxPatterns(debuggerModel));
const sourceMapManager = debuggerModel.sourceMapManager();
for (const script of debuggerModel.scripts()) {
diff --git a/front_end/bindings/PresentationConsoleMessageHelper.js b/front_end/bindings/PresentationConsoleMessageHelper.js
index 536fde2..cfd415f 100644
--- a/front_end/bindings/PresentationConsoleMessageHelper.js
+++ b/front_end/bindings/PresentationConsoleMessageHelper.js
@@ -39,7 +39,7 @@
*/
export class PresentationConsoleMessageManager {
constructor() {
- self.SDK.targetManager.observeModels(SDK.DebuggerModel.DebuggerModel, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.DebuggerModel.DebuggerModel, this);
self.SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, this);
self.SDK.consoleModel.addEventListener(
@@ -77,7 +77,7 @@
}
_consoleCleared() {
- for (const debuggerModel of self.SDK.targetManager.models(SDK.DebuggerModel.DebuggerModel)) {
+ for (const debuggerModel of SDK.SDKModel.TargetManager.instance().models(SDK.DebuggerModel.DebuggerModel)) {
debuggerModel[PresentationConsoleMessageManager._symbol]._consoleCleared();
}
}
diff --git a/front_end/bindings/ResourceUtils.js b/front_end/bindings/ResourceUtils.js
index 90206bc..e83fcc3 100644
--- a/front_end/bindings/ResourceUtils.js
+++ b/front_end/bindings/ResourceUtils.js
@@ -38,7 +38,8 @@
* @return {?SDK.Resource.Resource}
*/
export function resourceForURL(url) {
- for (const resourceTreeModel of self.SDK.targetManager.models(SDK.ResourceTreeModel.ResourceTreeModel)) {
+ for (const resourceTreeModel of SDK.SDKModel.TargetManager.instance().models(
+ SDK.ResourceTreeModel.ResourceTreeModel)) {
const resource = resourceTreeModel.resourceForURL(url);
if (resource) {
return resource;
@@ -66,7 +67,7 @@
return uiSourceCode.displayName();
}
- const mainTarget = self.SDK.targetManager.mainTarget();
+ const mainTarget = SDK.SDKModel.TargetManager.instance().mainTarget();
const inspectedURL = mainTarget && mainTarget.inspectedURL();
if (!inspectedURL) {
return Platform.StringUtilities.trimURL(url, '');
diff --git a/front_end/browser_debugger/DOMBreakpointsSidebarPane.js b/front_end/browser_debugger/DOMBreakpointsSidebarPane.js
index ffc6e98..a3ece6b 100644
--- a/front_end/browser_debugger/DOMBreakpointsSidebarPane.js
+++ b/front_end/browser_debugger/DOMBreakpointsSidebarPane.js
@@ -53,17 +53,18 @@
UI.ARIAUtils.setAccessibleName(this._list.element, ls`DOM Breakpoints list`);
this._emptyElement.tabIndex = -1;
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DOMDebuggerModel.DOMDebuggerModel, SDK.DOMDebuggerModel.Events.DOMBreakpointAdded, this._breakpointAdded,
this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DOMDebuggerModel.DOMDebuggerModel, SDK.DOMDebuggerModel.Events.DOMBreakpointToggled,
this._breakpointToggled, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DOMDebuggerModel.DOMDebuggerModel, SDK.DOMDebuggerModel.Events.DOMBreakpointsRemoved,
this._breakpointsRemoved, this);
- for (const domDebuggerModel of self.SDK.targetManager.models(SDK.DOMDebuggerModel.DOMDebuggerModel)) {
+ for (const domDebuggerModel of SDK.SDKModel.TargetManager.instance().models(
+ SDK.DOMDebuggerModel.DOMDebuggerModel)) {
domDebuggerModel.retrieveDOMBreakpoints();
for (const breakpoint of domDebuggerModel.domBreakpoints()) {
this._addBreakpoint(breakpoint);
diff --git a/front_end/browser_debugger/EventListenerBreakpointsSidebarPane.js b/front_end/browser_debugger/EventListenerBreakpointsSidebarPane.js
index 42cea60..4616916 100644
--- a/front_end/browser_debugger/EventListenerBreakpointsSidebarPane.js
+++ b/front_end/browser_debugger/EventListenerBreakpointsSidebarPane.js
@@ -36,9 +36,9 @@
this._createBreakpoint(breakpoint);
}
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DebuggerModel.DebuggerModel, SDK.DebuggerModel.Events.DebuggerPaused, this._update, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DebuggerModel.DebuggerModel, SDK.DebuggerModel.Events.DebuggerResumed, this._update, this);
self.UI.context.addFlavorChangeListener(SDK.SDKModel.Target, this._update, this);
}
diff --git a/front_end/browser_sdk/LogManager.js b/front_end/browser_sdk/LogManager.js
index 6bc58b0..0d1ade2 100644
--- a/front_end/browser_sdk/LogManager.js
+++ b/front_end/browser_sdk/LogManager.js
@@ -10,7 +10,7 @@
*/
export class LogManager {
constructor() {
- self.SDK.targetManager.observeModels(SDK.LogModel.LogModel, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.LogModel.LogModel, this);
}
/**
@@ -53,11 +53,11 @@
// user can see messages from the worker which has been already destroyed.
// When opening DevTools, give us some time to connect to the worker and
// not report the message twice if the worker is still alive.
- if (self.SDK.targetManager.targetById(workerId)) {
+ if (SDK.SDKModel.TargetManager.instance().targetById(workerId)) {
return;
}
setTimeout(() => {
- if (!self.SDK.targetManager.targetById(workerId)) {
+ if (!SDK.SDKModel.TargetManager.instance().targetById(workerId)) {
self.SDK.consoleModel.addMessage(consoleMessage);
}
}, 1000);
diff --git a/front_end/color_picker/Spectrum.js b/front_end/color_picker/Spectrum.js
index 031d6fb..b497b7e 100644
--- a/front_end/color_picker/Spectrum.js
+++ b/front_end/color_picker/Spectrum.js
@@ -1172,7 +1172,7 @@
/** @type {!Map.<string, number>} */
this._frequencyMap = new Map();
const stylesheetPromises = [];
- for (const cssModel of self.SDK.targetManager.models(SDK.CSSModel.CSSModel)) {
+ for (const cssModel of SDK.SDKModel.TargetManager.instance().models(SDK.CSSModel.CSSModel)) {
for (const stylesheet of cssModel.allStyleSheets()) {
stylesheetPromises.push(this._processStylesheet(stylesheet));
}
diff --git a/front_end/components/Linkifier.js b/front_end/components/Linkifier.js
index 09d3019..b0e64d6 100644
--- a/front_end/components/Linkifier.js
+++ b/front_end/components/Linkifier.js
@@ -31,10 +31,11 @@
import * as Bindings from '../bindings/bindings.js';
import * as Common from '../common/common.js';
import * as Host from '../host/host.js';
+import * as SDK from '../sdk/sdk.js';
import * as UI from '../ui/ui.js';
/**
- * @implements {SDK.TargetManager.Observer}
+ * @implements {SDK.SDKModel.Observer}
* @unrestricted
*/
export class Linkifier {
@@ -44,13 +45,13 @@
*/
constructor(maxLengthForDisplayedURLs, useLinkDecorator) {
this._maxLength = maxLengthForDisplayedURLs || UI.UIUtils.MaxLengthForDisplayedURLs;
- /** @type {!Map<!SDK.Target, !Array<!Element>>} */
+ /** @type {!Map<!SDK.SDKModel.Target, !Array<!Element>>} */
this._anchorsByTarget = new Map();
- /** @type {!Map<!SDK.Target, !Bindings.LiveLocation.LiveLocationPool>} */
+ /** @type {!Map<!SDK.SDKModel.Target, !Bindings.LiveLocation.LiveLocationPool>} */
this._locationPoolByTarget = new Map();
this._useLinkDecorator = !!useLinkDecorator;
_instances.add(this);
- self.SDK.targetManager.observeTargets(this);
+ SDK.SDKModel.TargetManager.instance().observeTargets(this);
}
/**
@@ -121,7 +122,7 @@
/**
* @override
- * @param {!SDK.Target} target
+ * @param {!SDK.SDKModel.Target} target
*/
targetAdded(target) {
this._anchorsByTarget.set(target, []);
@@ -130,7 +131,7 @@
/**
* @override
- * @param {!SDK.Target} target
+ * @param {!SDK.SDKModel.Target} target
*/
targetRemoved(target) {
const locationPool =
@@ -152,7 +153,7 @@
}
/**
- * @param {?SDK.Target} target
+ * @param {?SDK.SDKModel.Target} target
* @param {?string} scriptId
* @param {string} sourceURL
* @param {number} lineNumber
@@ -169,7 +170,7 @@
if (!target || target.isDisposed()) {
return fallbackAnchor;
}
- const debuggerModel = target.model(SDK.DebuggerModel);
+ const debuggerModel = target.model(SDK.DebuggerModel.DebuggerModel);
if (!debuggerModel) {
return fallbackAnchor;
}
@@ -200,7 +201,7 @@
}
/**
- * @param {?SDK.Target} target
+ * @param {?SDK.SDKModel.Target} target
* @param {?string} scriptId
* @param {string} sourceURL
* @param {number} lineNumber
@@ -225,7 +226,7 @@
}
/**
- * @param {?SDK.Target} target
+ * @param {?SDK.SDKModel.Target} target
* @param {!Protocol.Runtime.CallFrame} callFrame
* @param {!Components.LinkifyOptions=} options
* @return {?Element}
@@ -235,7 +236,7 @@
}
/**
- * @param {!SDK.Target} target
+ * @param {!SDK.SDKModel.Target} target
* @param {!Protocol.Runtime.StackTrace} stackTrace
* @param {string=} classes
* @return {!Element}
@@ -254,7 +255,7 @@
return fallbackAnchor;
}
- const debuggerModel = target.model(SDK.DebuggerModel);
+ const debuggerModel = target.model(SDK.DebuggerModel.DebuggerModel);
const rawLocations = debuggerModel.createRawLocationsByStackTrace(stackTrace);
if (rawLocations.length === 0) {
return fallbackAnchor;
@@ -274,7 +275,7 @@
}
/**
- * @param {!SDK.CSSLocation} rawLocation
+ * @param {!SDK.CSSModel.CSSLocation} rawLocation
* @param {string=} classes
* @return {!Element}
*/
@@ -305,7 +306,7 @@
for (const target of [...this._anchorsByTarget.keys()]) {
this.targetRemoved(target);
}
- self.SDK.targetManager.unobserveTargets(this);
+ SDK.SDKModel.TargetManager.instance().unobserveTargets(this);
_instances.delete(this);
}
@@ -784,7 +785,7 @@
contextMenu.revealSection().appendItem(
Common.UIString.UIString('Open using %s', title), handler.bind(null, contentProvider, 0));
}
- if (contentProvider instanceof SDK.NetworkRequest) {
+ if (contentProvider instanceof SDK.NetworkRequest.NetworkRequest) {
return;
}
diff --git a/front_end/console/ConsoleContextSelector.js b/front_end/console/ConsoleContextSelector.js
index 6557c41..a946b6b 100644
--- a/front_end/console/ConsoleContextSelector.js
+++ b/front_end/console/ConsoleContextSelector.js
@@ -25,24 +25,24 @@
this._toolbarItem.element.classList.add('toolbar-has-dropdown');
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.RuntimeModel.RuntimeModel, SDK.RuntimeModel.Events.ExecutionContextCreated, this._onExecutionContextCreated,
this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.RuntimeModel.RuntimeModel, SDK.RuntimeModel.Events.ExecutionContextChanged, this._onExecutionContextChanged,
this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.RuntimeModel.RuntimeModel, SDK.RuntimeModel.Events.ExecutionContextDestroyed,
this._onExecutionContextDestroyed, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.FrameNavigated, this._frameNavigated,
this);
self.UI.context.addFlavorChangeListener(
SDK.RuntimeModel.ExecutionContext, this._executionContextChangedExternally, this);
self.UI.context.addFlavorChangeListener(SDK.DebuggerModel.CallFrame, this._callFrameSelectedInUI, this);
- self.SDK.targetManager.observeModels(SDK.RuntimeModel.RuntimeModel, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.RuntimeModel.RuntimeModel, this);
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DebuggerModel.DebuggerModel, SDK.DebuggerModel.Events.CallFrameSelected, this._callFrameSelectedInModel,
this);
}
diff --git a/front_end/console/ConsoleView.js b/front_end/console/ConsoleView.js
index ca9eede..a4ed302 100644
--- a/front_end/console/ConsoleView.js
+++ b/front_end/console/ConsoleView.js
@@ -759,7 +759,7 @@
}
async _saveConsole() {
- const url = self.SDK.targetManager.mainTarget().inspectedURL();
+ const url = SDK.SDKModel.TargetManager.instance().mainTarget().inspectedURL();
const parsedURL = Common.ParsedURL.ParsedURL.fromString(url);
const filename = Platform.StringUtilities.sprintf('%s-%d.log', parsedURL ? parsedURL.host : 'console', Date.now());
const stream = new Bindings.FileUtils.FileOutputStream();
diff --git a/front_end/coverage/CoverageView.js b/front_end/coverage/CoverageView.js
index a446ea9..3b96e05 100644
--- a/front_end/coverage/CoverageView.js
+++ b/front_end/coverage/CoverageView.js
@@ -56,7 +56,7 @@
this._toggleRecordButton = UI.Toolbar.Toolbar.createActionButton(this._toggleRecordAction);
toolbar.appendToolbarItem(this._toggleRecordButton);
- const mainTarget = self.SDK.targetManager.mainTarget();
+ const mainTarget = SDK.SDKModel.TargetManager.instance().mainTarget();
const mainTargetSupportsRecordOnReload = mainTarget && mainTarget.model(SDK.ResourceTreeModel.ResourceTreeModel);
if (mainTargetSupportsRecordOnReload) {
const startWithReloadAction =
@@ -215,7 +215,7 @@
*/
async _startRecording(options) {
this._reset();
- const mainTarget = self.SDK.targetManager.mainTarget();
+ const mainTarget = SDK.SDKModel.TargetManager.instance().mainTarget();
if (!mainTarget) {
return;
}
diff --git a/front_end/css_overview/CSSOverviewController.js b/front_end/css_overview/CSSOverviewController.js
index 55473b4..7a8e343 100644
--- a/front_end/css_overview/CSSOverviewController.js
+++ b/front_end/css_overview/CSSOverviewController.js
@@ -12,17 +12,17 @@
constructor() {
super();
- this.currentUrl = self.SDK.targetManager.inspectedURL();
- self.SDK.targetManager.addEventListener(
+ this.currentUrl = SDK.SDKModel.TargetManager.instance().inspectedURL();
+ SDK.SDKModel.TargetManager.instance().addEventListener(
SDK.SDKModel.Events.InspectedURLChanged, this._checkUrlAndResetIfChanged, this);
}
_checkUrlAndResetIfChanged() {
- if (this.currentUrl === self.SDK.targetManager.inspectedURL()) {
+ if (this.currentUrl === SDK.SDKModel.TargetManager.instance().inspectedURL()) {
return;
}
- this.currentUrl = self.SDK.targetManager.inspectedURL();
+ this.currentUrl = SDK.SDKModel.TargetManager.instance().inspectedURL();
this.dispatchEventToListeners(Events.Reset);
}
}
diff --git a/front_end/css_overview/CSSOverviewPanel.js b/front_end/css_overview/CSSOverviewPanel.js
index 8e3c52f..9ea28d1 100644
--- a/front_end/css_overview/CSSOverviewPanel.js
+++ b/front_end/css_overview/CSSOverviewPanel.js
@@ -19,7 +19,7 @@
this.registerRequiredCSS('css_overview/cssOverview.css');
this.element.classList.add('css-overview-panel');
- const [model] = self.SDK.targetManager.models(CSSOverviewModel);
+ const [model] = SDK.SDKModel.TargetManager.instance().models(CSSOverviewModel);
this._model = model;
this._controller = new OverviewController();
diff --git a/front_end/devices/DevicesView.js b/front_end/devices/DevicesView.js
index d23bb57..2171426 100644
--- a/front_end/devices/DevicesView.js
+++ b/front_end/devices/DevicesView.js
@@ -11,7 +11,7 @@
`<a class="devtools-link" role="link" tabindex="0" href="#" style="display: inline; cursor: pointer;">chrome://inspect/#devices</a>`;
self.onInvokeElement(documentationLink, event => {
- self.SDK.targetManager.mainTarget().pageAgent().navigate('chrome://inspect/#devices');
+ SDK.SDKModel.TargetManager.instance().mainTarget().pageAgent().navigate('chrome://inspect/#devices');
event.consume(true);
});
diff --git a/front_end/elements/ClassesPaneWidget.js b/front_end/elements/ClassesPaneWidget.js
index a99e3e3..0780300 100644
--- a/front_end/elements/ClassesPaneWidget.js
+++ b/front_end/elements/ClassesPaneWidget.js
@@ -31,7 +31,7 @@
this._prompt.addEventListener(UI.TextPrompt.Events.TextChanged, this._onTextChanged, this);
proxyElement.addEventListener('keydown', this._onKeyDown.bind(this), false);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DOMModel.DOMModel, SDK.DOMModel.Events.DOMMutated, this._onDOMMutated, this);
/** @type {!Set<!SDK.DOMModel.DOMNode>} */
this._mutatingNodes = new Set();
diff --git a/front_end/elements/ElementsPanel.js b/front_end/elements/ElementsPanel.js
index d200e01..4da8813 100644
--- a/front_end/elements/ElementsPanel.js
+++ b/front_end/elements/ElementsPanel.js
@@ -97,12 +97,12 @@
this._treeOutlines = new Set();
/** @type {!Map<!ElementsTreeOutline, !Element>} */
this._treeOutlineHeaders = new Map();
- self.SDK.targetManager.observeModels(SDK.DOMModel.DOMModel, this);
- self.SDK.targetManager.addEventListener(
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.DOMModel.DOMModel, this);
+ SDK.SDKModel.TargetManager.instance().addEventListener(
SDK.SDKModel.Events.NameChanged,
event => this._targetNameChanged(/** @type {!SDK.SDKModel.Target} */ (event.data)));
self.Common.settings.moduleSetting('showUAShadowDOM').addChangeListener(this._showUAShadowDOMChanged.bind(this));
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DOMModel.DOMModel, SDK.DOMModel.Events.DocumentUpdated, this._documentUpdatedEvent, this);
self.Extensions.extensionServer.addEventListener(
Extensions.ExtensionServer.Events.SidebarPaneAdded, this._extensionSidebarPaneAdded, this);
@@ -267,7 +267,7 @@
super.wasShown();
this._breadcrumbs.update();
- const domModels = self.SDK.targetManager.models(SDK.DOMModel.DOMModel);
+ const domModels = SDK.SDKModel.TargetManager.instance().models(SDK.DOMModel.DOMModel);
for (const domModel of domModels) {
if (domModel.parentModel()) {
continue;
@@ -461,7 +461,7 @@
this._searchConfig = searchConfig;
const showUAShadowDOM = self.Common.settings.moduleSetting('showUAShadowDOM').get();
- const domModels = self.SDK.targetManager.models(SDK.DOMModel.DOMModel);
+ const domModels = SDK.SDKModel.TargetManager.instance().models(SDK.DOMModel.DOMModel);
const promises = domModels.map(domModel => domModel.performSearch(whitespaceTrimmedQuery, showUAShadowDOM));
Promise.all(promises).then(resultCountCallback.bind(this));
diff --git a/front_end/elements/ElementsTreeElementHighlighter.js b/front_end/elements/ElementsTreeElementHighlighter.js
index 9e2f725..ba277e9 100644
--- a/front_end/elements/ElementsTreeElementHighlighter.js
+++ b/front_end/elements/ElementsTreeElementHighlighter.js
@@ -21,9 +21,9 @@
this._treeOutline.addEventListener(UI.TreeOutline.Events.ElementExpanded, this._clearState, this);
this._treeOutline.addEventListener(UI.TreeOutline.Events.ElementCollapsed, this._clearState, this);
this._treeOutline.addEventListener(ElementsTreeOutline.Events.SelectedNodeChanged, this._clearState, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.OverlayModel.OverlayModel, SDK.OverlayModel.Events.HighlightNodeRequested, this._highlightNode, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.OverlayModel.OverlayModel, SDK.OverlayModel.Events.InspectModeWillBeToggled, this._clearState, this);
}
diff --git a/front_end/elements/InspectElementModeController.js b/front_end/elements/InspectElementModeController.js
index dc277c0..f4239eb 100644
--- a/front_end/elements/InspectElementModeController.js
+++ b/front_end/elements/InspectElementModeController.js
@@ -44,12 +44,13 @@
constructor() {
this._toggleSearchAction = self.UI.actionRegistry.action('elements.toggle-element-search');
this._mode = Protocol.Overlay.InspectMode.None;
- self.SDK.targetManager.addEventListener(SDK.SDKModel.Events.SuspendStateChanged, this._suspendStateChanged, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addEventListener(
+ SDK.SDKModel.Events.SuspendStateChanged, this._suspendStateChanged, this);
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.OverlayModel.OverlayModel, SDK.OverlayModel.Events.ExitedInspectMode,
() => this._setMode(Protocol.Overlay.InspectMode.None));
SDK.OverlayModel.OverlayModel.setInspectNodeHandler(this._inspectNode.bind(this));
- self.SDK.targetManager.observeModels(SDK.OverlayModel.OverlayModel, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.OverlayModel.OverlayModel, this);
this._showDetailedInspectTooltipSetting = self.Common.settings.moduleSetting('showDetailedInspectTooltip');
this._showDetailedInspectTooltipSetting.addChangeListener(this._showDetailedInspectTooltipChanged.bind(this));
@@ -113,18 +114,18 @@
* @param {!Protocol.Overlay.InspectMode} mode
*/
_setMode(mode) {
- if (self.SDK.targetManager.allTargetsSuspended()) {
+ if (SDK.SDKModel.TargetManager.instance().allTargetsSuspended()) {
return;
}
this._mode = mode;
- for (const overlayModel of self.SDK.targetManager.models(SDK.OverlayModel.OverlayModel)) {
+ for (const overlayModel of SDK.SDKModel.TargetManager.instance().models(SDK.OverlayModel.OverlayModel)) {
overlayModel.setInspectMode(mode, this._showDetailedInspectTooltipSetting.get());
}
this._toggleSearchAction.setToggled(this._isInInspectElementMode());
}
_suspendStateChanged() {
- if (!self.SDK.targetManager.allTargetsSuspended()) {
+ if (!SDK.SDKModel.TargetManager.instance().allTargetsSuspended()) {
return;
}
diff --git a/front_end/elements/PropertiesWidget.js b/front_end/elements/PropertiesWidget.js
index 2f4992c..cf5a46b 100644
--- a/front_end/elements/PropertiesWidget.js
+++ b/front_end/elements/PropertiesWidget.js
@@ -41,13 +41,13 @@
super(true /* isWebComponent */);
this.registerRequiredCSS('elements/propertiesWidget.css');
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DOMModel.DOMModel, SDK.DOMModel.Events.AttrModified, this._onNodeChange, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DOMModel.DOMModel, SDK.DOMModel.Events.AttrRemoved, this._onNodeChange, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DOMModel.DOMModel, SDK.DOMModel.Events.CharacterDataModified, this._onNodeChange, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DOMModel.DOMModel, SDK.DOMModel.Events.ChildNodeCountUpdated, this._onNodeChange, this);
self.UI.context.addFlavorChangeListener(SDK.DOMModel.DOMNode, this._setNode, this);
this._node = self.UI.context.flavor(SDK.DOMModel.DOMNode);
diff --git a/front_end/emulation/DeviceModeModel.js b/front_end/emulation/DeviceModeModel.js
index 3f95749..7476a3e 100644
--- a/front_end/emulation/DeviceModeModel.js
+++ b/front_end/emulation/DeviceModeModel.js
@@ -77,7 +77,7 @@
this._emulationModel = null;
/** @type {?function()} */
this._onModelAvailable = null;
- self.SDK.targetManager.observeModels(SDK.EmulationModel.EmulationModel, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.EmulationModel.EmulationModel, this);
}
/**
@@ -769,7 +769,7 @@
_applyTouch(touchEnabled, mobile) {
this._touchEnabled = touchEnabled;
this._touchMobile = mobile;
- for (const emulationModel of self.SDK.targetManager.models(SDK.EmulationModel.EmulationModel)) {
+ for (const emulationModel of SDK.SDKModel.TargetManager.instance().models(SDK.EmulationModel.EmulationModel)) {
emulationModel.emulateTouch(touchEnabled, mobile);
}
}
diff --git a/front_end/emulation/DeviceModeWrapper.js b/front_end/emulation/DeviceModeWrapper.js
index b0c3ef1..1d042d7 100644
--- a/front_end/emulation/DeviceModeWrapper.js
+++ b/front_end/emulation/DeviceModeWrapper.js
@@ -29,7 +29,7 @@
this._showDeviceModeSetting = model.enabledSetting();
this._showDeviceModeSetting.setRequiresUserAction(!!Root.Runtime.queryParam('hasOtherClients'));
this._showDeviceModeSetting.addChangeListener(this._update.bind(this, false));
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.OverlayModel.OverlayModel, SDK.OverlayModel.Events.ScreenshotRequested,
this._screenshotRequestedFromOverlay, this);
this._update(true);
diff --git a/front_end/emulation/MediaQueryInspector.js b/front_end/emulation/MediaQueryInspector.js
index c57b44b..a6523de 100644
--- a/front_end/emulation/MediaQueryInspector.js
+++ b/front_end/emulation/MediaQueryInspector.js
@@ -29,7 +29,7 @@
this._setWidthCallback = setWidthCallback;
this._scale = 1;
- self.SDK.targetManager.observeModels(SDK.CSSModel.CSSModel, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.CSSModel.CSSModel, this);
self.UI.zoomManager.addEventListener(UI.ZoomManager.Events.ZoomChanged, this._renderMediaQueries.bind(this), this);
}
diff --git a/front_end/emulation/SensorsView.js b/front_end/emulation/SensorsView.js
index a3a4c69..49c27dd 100644
--- a/front_end/emulation/SensorsView.js
+++ b/front_end/emulation/SensorsView.js
@@ -185,7 +185,7 @@
if (this._geolocationOverrideEnabled) {
this._geolocationSetting.set(this._geolocation.toSetting());
}
- for (const emulationModel of self.SDK.targetManager.models(SDK.EmulationModel.EmulationModel)) {
+ for (const emulationModel of SDK.SDKModel.TargetManager.instance().models(SDK.EmulationModel.EmulationModel)) {
emulationModel.emulateGeolocation(this._geolocationOverrideEnabled ? this._geolocation : null).catch(err => {
switch (err.type) {
case 'emulation-set-timezone':
@@ -288,7 +288,7 @@
if (this._deviceOrientationOverrideEnabled) {
this._deviceOrientationSetting.set(this._deviceOrientation.toSetting());
}
- for (const emulationModel of self.SDK.targetManager.models(SDK.EmulationModel.EmulationModel)) {
+ for (const emulationModel of SDK.SDKModel.TargetManager.instance().models(SDK.EmulationModel.EmulationModel)) {
emulationModel.emulateDeviceOrientation(this._deviceOrientationOverrideEnabled ? this._deviceOrientation : null);
}
}
@@ -510,11 +510,12 @@
UI.ARIAUtils.markAsAlert(reloadWarning);
function applyTouch() {
- for (const emulationModel of self.SDK.targetManager.models(SDK.EmulationModel.EmulationModel)) {
+ for (const emulationModel of SDK.SDKModel.TargetManager.instance().models(SDK.EmulationModel.EmulationModel)) {
emulationModel.overrideEmulateTouch(select.value === 'enabled');
}
reloadWarning.classList.remove('hidden');
- const resourceTreeModel = self.SDK.targetManager.models(SDK.ResourceTreeModel.ResourceTreeModel)[0];
+ const resourceTreeModel =
+ SDK.SDKModel.TargetManager.instance().models(SDK.ResourceTreeModel.ResourceTreeModel)[0];
if (resourceTreeModel) {
resourceTreeModel.once(SDK.ResourceTreeModel.Events.MainFrameNavigated)
.then(() => reloadWarning.classList.add('hidden'));
diff --git a/front_end/extensions/ExtensionServer.js b/front_end/extensions/ExtensionServer.js
index b77d3e4..52e2207 100644
--- a/front_end/extensions/ExtensionServer.js
+++ b/front_end/extensions/ExtensionServer.js
@@ -153,7 +153,7 @@
}
_inspectedURLChanged(event) {
- if (event.data !== self.SDK.targetManager.mainTarget()) {
+ if (event.data !== SDK.SDKModel.TargetManager.instance().mainTarget()) {
return;
}
this._requests = {};
@@ -508,7 +508,8 @@
uiSourceCodes = uiSourceCodes.concat(
self.Workspace.workspace.uiSourceCodesForProjectType(Workspace.Workspace.projectTypes.ContentScripts));
uiSourceCodes.forEach(pushResourceData.bind(this));
- for (const resourceTreeModel of self.SDK.targetManager.models(SDK.ResourceTreeModel.ResourceTreeModel)) {
+ for (const resourceTreeModel of SDK.SDKModel.TargetManager.instance().models(
+ SDK.ResourceTreeModel.ResourceTreeModel)) {
resourceTreeModel.forAllResources(pushResourceData.bind(this));
}
return [...resources.values()];
@@ -669,7 +670,8 @@
onElementsSubscriptionStopped.bind(this));
this._registerResourceContentCommittedHandler(this._notifyUISourceCodeContentCommitted);
- self.SDK.targetManager.addEventListener(SDK.SDKModel.Events.InspectedURLChanged, this._inspectedURLChanged, this);
+ SDK.SDKModel.TargetManager.instance().addEventListener(
+ SDK.SDKModel.Events.InspectedURLChanged, this._inspectedURLChanged, this);
}
_notifyResourceAdded(event) {
@@ -816,10 +818,10 @@
_registerAutosubscriptionTargetManagerHandler(eventTopic, modelClass, frontendEventType, handler) {
this._registerSubscriptionHandler(
eventTopic,
- self.SDK.targetManager.addModelListener.bind(
- self.SDK.targetManager, modelClass, frontendEventType, handler, this),
- self.SDK.targetManager.removeModelListener.bind(
- self.SDK.targetManager, modelClass, frontendEventType, handler, this));
+ SDK.SDKModel.TargetManager.instance().addModelListener.bind(
+ SDK.SDKModel.TargetManager.instance(), modelClass, frontendEventType, handler, this),
+ SDK.SDKModel.TargetManager.instance().removeModelListener.bind(
+ SDK.SDKModel.TargetManager.instance(), modelClass, frontendEventType, handler, this));
}
_registerResourceContentCommittedHandler(handler) {
@@ -904,7 +906,7 @@
if (options.frameURL) {
frame = resolveURLToFrame(options.frameURL);
} else {
- const target = self.SDK.targetManager.mainTarget();
+ const target = SDK.SDKModel.TargetManager.instance().mainTarget();
const resourceTreeModel = target && target.model(SDK.ResourceTreeModel.ResourceTreeModel);
frame = resourceTreeModel && resourceTreeModel.mainFrame;
}
diff --git a/front_end/input/InputTimeline.js b/front_end/input/InputTimeline.js
index faa1f6b..591367c 100644
--- a/front_end/input/InputTimeline.js
+++ b/front_end/input/InputTimeline.js
@@ -187,7 +187,7 @@
this._setState(State.StartPending);
this._tracingClient = new InputTimeline.TracingClient(
- /** @type {!SDK.SDKModel.Target} */ (self.SDK.targetManager.mainTarget()), this);
+ /** @type {!SDK.SDKModel.Target} */ (SDK.SDKModel.TargetManager.instance().mainTarget()), this);
const response = await this._tracingClient.startRecording();
if (response[ProtocolModule.InspectorBackend.ProtocolError]) {
@@ -247,7 +247,8 @@
this._reset();
return;
}
- this._inputModel = new InputModel(/** @type {!SDK.SDKModel.Target} */ (self.SDK.targetManager.mainTarget()));
+ this._inputModel =
+ new InputModel(/** @type {!SDK.SDKModel.Target} */ (SDK.SDKModel.TargetManager.instance().mainTarget()));
this._tracingModel = tracingModel;
this._inputModel.setEvents(tracingModel);
@@ -362,7 +363,7 @@
}
await this._waitForTracingToStop(true);
- await self.SDK.targetManager.resumeAllTargets();
+ await SDK.SDKModel.TargetManager.instance().resumeAllTargets();
this._tracingModel.tracingComplete();
this._client.loadingComplete(this._tracingModel);
}
diff --git a/front_end/inspector_main/InspectorMain.js b/front_end/inspector_main/InspectorMain.js
index 26c1956..aeb74fa 100644
--- a/front_end/inspector_main/InspectorMain.js
+++ b/front_end/inspector_main/InspectorMain.js
@@ -21,7 +21,7 @@
await SDK.Connections.initMainConnection(async () => {
const type = Root.Runtime.queryParam('v8only') ? SDK.SDKModel.Type.Node : SDK.SDKModel.Type.Frame;
const waitForDebuggerInPage = type === SDK.SDKModel.Type.Frame && Root.Runtime.queryParam('panel') === 'sources';
- const target = self.SDK.targetManager.createTarget(
+ const target = SDK.SDKModel.TargetManager.instance().createTarget(
'main', Common.UIString.UIString('Main'), type, null, undefined, waitForDebuggerInPage);
// Only resume target during the first connection,
@@ -91,7 +91,7 @@
* @return {boolean}
*/
handleAction(context, actionId) {
- self.SDK.targetManager.mainTarget().pageAgent().bringToFront();
+ SDK.SDKModel.TargetManager.instance().mainTarget().pageAgent().bringToFront();
return true;
}
}
@@ -108,7 +108,7 @@
'click', () => Host.InspectorFrontendHost.InspectorFrontendHostInstance.openNodeFrontend(), false);
this._button = new UI.Toolbar.ToolbarItem(element);
this._button.setTitle(Common.UIString.UIString('Open dedicated DevTools for Node.js'));
- self.SDK.targetManager.addEventListener(
+ SDK.SDKModel.TargetManager.instance().addEventListener(
SDK.SDKModel.Events.AvailableTargetsChanged,
event => this._update(/** @type {!Array<!Protocol.Target.TargetInfo>} */ (event.data)));
this._button.setVisible(false);
@@ -171,7 +171,7 @@
this._emulatePageFocusSetting = self.Common.settings.moduleSetting('emulatePageFocus');
this._emulatePageFocusSetting.addChangeListener(this._update, this);
- self.SDK.targetManager.observeTargets(this);
+ SDK.SDKModel.TargetManager.instance().observeTargets(this);
}
/**
@@ -190,7 +190,7 @@
}
_update() {
- for (const target of self.SDK.targetManager.targets()) {
+ for (const target of SDK.SDKModel.TargetManager.instance().targets()) {
this._updateTarget(target);
}
}
diff --git a/front_end/issues/IssuesPane.js b/front_end/issues/IssuesPane.js
index ceeb08e..0379de4 100644
--- a/front_end/issues/IssuesPane.js
+++ b/front_end/issues/IssuesPane.js
@@ -89,7 +89,7 @@
super(true);
this.registerRequiredCSS('issues/issuesPane.css');
- const mainTarget = self.SDK.targetManager.mainTarget();
+ const mainTarget = SDK.SDKModel.TargetManager.instance().mainTarget();
this._model = mainTarget.model(SDK.IssuesModel.IssuesModel);
this._model.addEventListener(SDK.IssuesModel.Events.IssueAdded, this._issueAdded, this);
this._model.addEventListener(SDK.IssuesModel.Events.AllIssuesCleared, this._issuesCleared, this);
diff --git a/front_end/js_main/JsMain.js b/front_end/js_main/JsMain.js
index 6576b64..c75d823 100644
--- a/front_end/js_main/JsMain.js
+++ b/front_end/js_main/JsMain.js
@@ -17,7 +17,7 @@
run() {
Host.userMetrics.actionTaken(Host.UserMetrics.Action.ConnectToNodeJSDirectly);
SDK.Connections.initMainConnection(() => {
- const target = self.SDK.targetManager.createTarget('main', ls`Main`, SDK.SDKModel.Type.Node, null);
+ const target = SDK.SDKModel.TargetManager.instance().createTarget('main', ls`Main`, SDK.SDKModel.Type.Node, null);
target.runtimeAgent().runIfWaitingForDebugger();
}, Components.TargetDetachedDialog.TargetDetachedDialog.webSocketConnectionLost);
}
diff --git a/front_end/layers/LayersPanel.js b/front_end/layers/LayersPanel.js
index 5c6fe20..e807aca 100644
--- a/front_end/layers/LayersPanel.js
+++ b/front_end/layers/LayersPanel.js
@@ -47,7 +47,7 @@
/** @type {?LayerTreeModel} */
this._model = null;
- self.SDK.targetManager.observeTargets(this);
+ SDK.SDKModel.TargetManager.instance().observeTargets(this);
this._layerViewHost = new LayerViewer.LayerViewHost.LayerViewHost();
this._layerTreeOutline = new LayerViewer.LayerTreeOutline.LayerTreeOutline(this._layerViewHost);
this._layerTreeOutline.addEventListener(
diff --git a/front_end/lighthouse/LighthouseController.js b/front_end/lighthouse/LighthouseController.js
index c951078..9a24ec7 100644
--- a/front_end/lighthouse/LighthouseController.js
+++ b/front_end/lighthouse/LighthouseController.js
@@ -2,11 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import * as Common from '../common/common.js';
+import * as SDK from '../sdk/sdk.js';
+
/**
- * @implements {SDK.SDKModelObserver<!SDK.ServiceWorkerManager>}
+ * @implements {SDK.SDKModel.SDKModelObserver<!SDK.ServiceWorkerManager.ServiceWorkerManager>}
* @unrestricted
*/
-export class LighthouseController extends Common.Object {
+export class LighthouseController extends Common.ObjectWrapper.ObjectWrapper {
constructor(protocolService) {
super();
@@ -17,14 +20,14 @@
preset.setting.addChangeListener(this.recomputePageAuditability.bind(this));
}
- self.SDK.targetManager.observeModels(SDK.ServiceWorkerManager, this);
- self.SDK.targetManager.addEventListener(
- SDK.TargetManager.Events.InspectedURLChanged, this.recomputePageAuditability, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.ServiceWorkerManager.ServiceWorkerManager, this);
+ SDK.SDKModel.TargetManager.instance().addEventListener(
+ SDK.SDKModel.Events.InspectedURLChanged, this.recomputePageAuditability, this);
}
/**
* @override
- * @param {!SDK.ServiceWorkerManager} serviceWorkerManager
+ * @param {!SDK.ServiceWorkerManager.ServiceWorkerManager} serviceWorkerManager
*/
modelAdded(serviceWorkerManager) {
if (this._manager) {
@@ -44,14 +47,14 @@
/**
* @override
- * @param {!SDK.ServiceWorkerManager} serviceWorkerManager
+ * @param {!SDK.ServiceWorkerManager.ServiceWorkerManager} serviceWorkerManager
*/
modelRemoved(serviceWorkerManager) {
if (this._manager !== serviceWorkerManager) {
return;
}
- Common.EventTarget.removeEventListeners(this._serviceWorkerListeners);
+ Common.EventTarget.EventTarget.removeEventListeners(this._serviceWorkerListeners);
this._manager = null;
this.recomputePageAuditability();
}
@@ -69,7 +72,7 @@
return false;
}
- const inspectedURL = Common.ParsedURL.fromString(mainTarget.inspectedURL());
+ const inspectedURL = Common.ParsedURL.ParsedURL.fromString(mainTarget.inspectedURL());
const inspectedOrigin = inspectedURL && inspectedURL.securityOrigin();
for (const registration of this._manager.registrations().values()) {
if (registration.securityOrigin !== inspectedOrigin) {
@@ -104,7 +107,7 @@
const mainTarget = this._manager.target();
const inspectedURL = mainTarget && mainTarget.inspectedURL();
if (inspectedURL && !/^(http|chrome-extension)/.test(inspectedURL)) {
- return Common.UIString(
+ return Common.UIString.UIString(
'Can only audit HTTP/HTTPS pages and Chrome extensions. Navigate to a different page to start an audit.');
}
@@ -116,7 +119,7 @@
*/
async _evaluateInspectedURL() {
const mainTarget = this._manager.target();
- const runtimeModel = mainTarget.model(SDK.RuntimeModel);
+ const runtimeModel = mainTarget.model(SDK.RuntimeModel.RuntimeModel);
const executionContext = runtimeModel && runtimeModel.defaultExecutionContext();
let inspectedURL = mainTarget.inspectedURL();
if (!executionContext) {
@@ -192,10 +195,10 @@
let helpText = '';
if (hasActiveServiceWorker) {
- helpText = Common.UIString(
+ helpText = Common.UIString.UIString(
'Multiple tabs are being controlled by the same service worker. Close your other tabs on the same origin to audit this page.');
} else if (!hasAtLeastOneCategory) {
- helpText = Common.UIString('At least one category must be selected.');
+ helpText = Common.UIString.UIString('At least one category must be selected.');
} else if (unauditablePageMessage) {
helpText = unauditablePageMessage;
}
diff --git a/front_end/lighthouse/LighthousePanel.js b/front_end/lighthouse/LighthousePanel.js
index d04b013..379336c 100644
--- a/front_end/lighthouse/LighthousePanel.js
+++ b/front_end/lighthouse/LighthousePanel.js
@@ -2,7 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-import * as Common from '../common/common.js'; // eslint-disable-line no-unused-vars
+import * as Common from '../common/common.js';
+import * as Emulation from '../emulation/emulation.js'; // eslint-disable-line no-unused-vars
+import * as HostModule from '../host/host.js';
+import * as SDK from '../sdk/sdk.js';
+import * as UI from '../ui/ui.js';
import {Events, LighthouseController} from './LighthouseController.js';
import {ProtocolService} from './LighthouseProtocolService.js';
@@ -14,7 +18,7 @@
/**
* @unrestricted
*/
-export class LighthousePanel extends UI.Panel {
+export class LighthousePanel extends UI.Panel.Panel {
constructor() {
super('lighthouse');
this.registerRequiredCSS('third_party/lighthouse/report-assets/report.css');
@@ -28,7 +32,7 @@
this._unauditableExplanation = null;
this._cachedRenderedReports = new Map();
- this._dropTarget = new UI.DropTarget(
+ this._dropTarget = new UI.DropTarget.DropTarget(
this.contentElement, [UI.DropTarget.Type.File], Common.UIString.UIString('Drop Lighthouse JSON here'),
this._handleDrop.bind(this));
@@ -82,31 +86,31 @@
_renderToolbar() {
const lighthouseToolbarContainer = this.element.createChild('div', 'lighthouse-toolbar-container');
- const toolbar = new UI.Toolbar('', lighthouseToolbarContainer);
+ const toolbar = new UI.Toolbar.Toolbar('', lighthouseToolbarContainer);
- this._newButton = new UI.ToolbarButton(Common.UIString.UIString('Perform an audit…'), 'largeicon-add');
+ this._newButton = new UI.Toolbar.ToolbarButton(Common.UIString.UIString('Perform an audit…'), 'largeicon-add');
toolbar.appendToolbarItem(this._newButton);
- this._newButton.addEventListener(UI.ToolbarButton.Events.Click, this._renderStartView.bind(this));
+ this._newButton.addEventListener(UI.Toolbar.ToolbarButton.Events.Click, this._renderStartView.bind(this));
toolbar.appendSeparator();
this._reportSelector = new ReportSelector(() => this._renderStartView());
toolbar.appendToolbarItem(this._reportSelector.comboBox());
- this._clearButton = new UI.ToolbarButton(Common.UIString.UIString('Clear all'), 'largeicon-clear');
+ this._clearButton = new UI.Toolbar.ToolbarButton(Common.UIString.UIString('Clear all'), 'largeicon-clear');
toolbar.appendToolbarItem(this._clearButton);
- this._clearButton.addEventListener(UI.ToolbarButton.Events.Click, this._clearAll.bind(this));
+ this._clearButton.addEventListener(UI.Toolbar.ToolbarButton.Events.Click, this._clearAll.bind(this));
- this._settingsPane = new UI.HBox();
+ this._settingsPane = new UI.Widget.HBox();
this._settingsPane.show(this.contentElement);
this._settingsPane.element.classList.add('lighthouse-settings-pane');
this._settingsPane.element.appendChild(this._startView.settingsToolbar().element);
this._showSettingsPaneSetting = self.Common.settings.createSetting('lighthouseShowSettingsToolbar', false);
- this._rightToolbar = new UI.Toolbar('', lighthouseToolbarContainer);
+ this._rightToolbar = new UI.Toolbar.Toolbar('', lighthouseToolbarContainer);
this._rightToolbar.appendSeparator();
- this._rightToolbar.appendToolbarItem(
- new UI.ToolbarSettingToggle(this._showSettingsPaneSetting, 'largeicon-settings-gear', ls`Lighthouse settings`));
+ this._rightToolbar.appendToolbarItem(new UI.Toolbar.ToolbarSettingToggle(
+ this._showSettingsPaneSetting, 'largeicon-settings-gear', ls`Lighthouse settings`));
this._showSettingsPaneSetting.addChangeListener(this._updateSettingsPaneVisibility.bind(this));
this._updateSettingsPaneVisibility();
@@ -218,8 +222,8 @@
}
_waitForMainTargetLoad() {
- const mainTarget = self.SDK.targetManager.mainTarget();
- const resourceTreeModel = mainTarget.model(SDK.ResourceTreeModel);
+ const mainTarget = SDK.SDKModel.TargetManager.instance().mainTarget();
+ const resourceTreeModel = mainTarget.model(SDK.ResourceTreeModel.ResourceTreeModel);
return resourceTreeModel.once(SDK.ResourceTreeModel.Events.Load);
}
@@ -276,7 +280,7 @@
* @param {!Common.EventTarget.EventTargetEvent} event
*/
async _startLighthouse(event) {
- Host.userMetrics.actionTaken(Host.UserMetrics.Action.LighthouseStarted);
+ HostModule.userMetrics.actionTaken(Host.UserMetrics.Action.LighthouseStarted);
try {
const inspectedURL = await this._controller.getInspectedURL({force: true});
@@ -299,7 +303,7 @@
throw new Error('Auditing failed to produce a result');
}
- Host.userMetrics.actionTaken(Host.UserMetrics.Action.LighthouseFinished);
+ HostModule.userMetrics.actionTaken(Host.UserMetrics.Action.LighthouseFinished);
await this._resetEmulationAndProtocolConnection();
this._buildReportUI(lighthouseResponse.lhr, lighthouseResponse.artifacts);
@@ -307,7 +311,7 @@
this._newButton.element.focus();
const keyboardInitiated = /** @type {boolean} */ (event.data);
if (keyboardInitiated) {
- UI.markAsFocusedByKeyboard(this._newButton.element);
+ UI.UIUtils.markAsFocusedByKeyboard(this._newButton.element);
}
} catch (err) {
await this._resetEmulationAndProtocolConnection();
@@ -333,7 +337,7 @@
async _setupEmulationAndProtocolConnection() {
const flags = this._controller.getFlags();
- const emulationModel = self.singleton(Emulation.DeviceModeModel);
+ const emulationModel = self.singleton(Emulation.DeviceModeModel.DeviceModeModel);
this._stateBefore = {
emulation: {
enabled: emulationModel.enabledSetting().get(),
@@ -351,7 +355,7 @@
emulationModel.enabledSetting().set(true);
emulationModel.deviceOutlineSetting().set(true);
- for (const device of Emulation.EmulatedDevicesList.instance().standard()) {
+ for (const device of Emulation.EmulatedDevices.EmulatedDevicesList.instance().standard()) {
if (device.title === 'Nexus 5X') {
emulationModel.emulate(Emulation.DeviceModeModel.Type.Device, device, device.modes[0], 1);
}
@@ -371,7 +375,7 @@
await this._protocolService.detach();
if (this._stateBefore) {
- const emulationModel = self.singleton(Emulation.DeviceModeModel);
+ const emulationModel = self.singleton(Emulation.DeviceModeModel.DeviceModeModel);
emulationModel.enabledSetting().set(this._stateBefore.emulation.enabled);
emulationModel.deviceOutlineSetting().set(this._stateBefore.emulation.outlineEnabled);
emulationModel.toolbarControlsEnabledSetting().set(this._stateBefore.emulation.toolbarControlsEnabled);
@@ -381,7 +385,8 @@
Emulation.InspectedPagePlaceholder.instance().update(true);
- const resourceTreeModel = self.SDK.targetManager.mainTarget().model(SDK.ResourceTreeModel);
+ const resourceTreeModel =
+ SDK.SDKModel.TargetManager.instance().mainTarget().model(SDK.ResourceTreeModel.ResourceTreeModel);
// reload to reset the page state
const inspectedURL = await this._controller.getInspectedURL();
await resourceTreeModel.navigate(inspectedURL);
diff --git a/front_end/lighthouse/LighthouseProtocolService.js b/front_end/lighthouse/LighthouseProtocolService.js
index 4290ede..d462b69 100644
--- a/front_end/lighthouse/LighthouseProtocolService.js
+++ b/front_end/lighthouse/LighthouseProtocolService.js
@@ -2,10 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-export class ProtocolService extends Common.Object {
+import * as Common from '../common/common.js';
+import * as ProtocolModule from '../protocol/protocol.js'; // eslint-disable-line no-unused-vars
+import * as SDK from '../sdk/sdk.js';
+
+export class ProtocolService extends Common.ObjectWrapper.ObjectWrapper {
constructor() {
super();
- /** @type {?Protocol.Connection} */
+ /** @type {?ProtocolModule.InspectorBackend.Connection} */
this._rawConnection = null;
/** @type {?Services.ServiceManager.Service} */
this._backend = null;
@@ -19,8 +23,9 @@
* @return {!Promise<undefined>}
*/
async attach() {
- await self.SDK.targetManager.suspendAllTargets();
- const childTargetManager = self.SDK.targetManager.mainTarget().model(SDK.ChildTargetManager);
+ await SDK.SDKModel.TargetManager.instance().suspendAllTargets();
+ const childTargetManager =
+ SDK.SDKModel.TargetManager.instance().mainTarget().model(SDK.ChildTargetManager.ChildTargetManager);
this._rawConnection = await childTargetManager.createParallelConnection(this._dispatchProtocolMessage.bind(this));
}
@@ -43,7 +48,7 @@
delete this._backend;
delete this._backendPromise;
await this._rawConnection.disconnect();
- await self.SDK.targetManager.resumeAllTargets();
+ await SDK.SDKModel.TargetManager.instance().resumeAllTargets();
}
/**
diff --git a/front_end/lighthouse/LighthouseReportRenderer.js b/front_end/lighthouse/LighthouseReportRenderer.js
index 942c5d3..a2fc4fd 100644
--- a/front_end/lighthouse/LighthouseReportRenderer.js
+++ b/front_end/lighthouse/LighthouseReportRenderer.js
@@ -2,6 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import * as Common from '../common/common.js';
+import * as Components from '../components/components.js';
+import * as HostModule from '../host/host.js';
+import * as SDK from '../sdk/sdk.js';
+import * as Timeline from '../timeline/timeline.js';
+import * as UI from '../ui/ui.js';
+
const MaxLengthForLinks = 40;
/**
@@ -25,13 +32,14 @@
}
const defaultPassTrace = artifacts.traces.defaultPass;
- const timelineButton = UI.createTextButton(Common.UIString('View Trace'), onViewTraceClick, 'view-trace');
+ const timelineButton =
+ UI.UIUtils.createTextButton(Common.UIString.UIString('View Trace'), onViewTraceClick, 'view-trace');
container.insertBefore(timelineButton, columnsEl.nextSibling);
async function onViewTraceClick() {
- Host.userMetrics.actionTaken(Host.UserMetrics.Action.LighthouseViewTrace);
+ HostModule.userMetrics.actionTaken(Host.UserMetrics.Action.LighthouseViewTrace);
await self.UI.inspectorView.showPanel('timeline');
- Timeline.TimelinePanel.instance().loadFromEvents(defaultPassTrace.traceEvents);
+ Timeline.TimelinePanel.TimelinePanel.instance().loadFromEvents(defaultPassTrace.traceEvents);
}
}
@@ -39,8 +47,8 @@
* @param {!Element} el
*/
static async linkifyNodeDetails(el) {
- const mainTarget = self.SDK.targetManager.mainTarget();
- const domModel = mainTarget.model(SDK.DOMModel);
+ const mainTarget = SDK.SDKModel.TargetManager.instance().mainTarget();
+ const domModel = mainTarget.model(SDK.DOMModel.DOMModel);
for (const origElement of el.getElementsByClassName('lh-node')) {
/** @type {!DetailsRenderer.NodeDetailsJSON} */
@@ -59,7 +67,7 @@
continue;
}
- const element = await Common.Linkifier.linkify(node, {tooltip: detailsItem.snippet});
+ const element = await Common.Linkifier.Linkifier.linkify(node, {tooltip: detailsItem.snippet});
origElement.title = '';
origElement.textContent = '';
origElement.appendChild(element);
@@ -79,8 +87,8 @@
const url = detailsItem.sourceUrl;
const line = Number(detailsItem.sourceLine);
const column = Number(detailsItem.sourceColumn);
- const element =
- await Components.Linkifier.linkifyURL(url, {lineNumber: line, column, maxLength: MaxLengthForLinks});
+ const element = await Components.Linkifier.Linkifier.linkifyURL(
+ url, {lineNumber: line, column, maxLength: MaxLengthForLinks});
origElement.title = '';
origElement.textContent = '';
origElement.appendChild(element);
@@ -139,7 +147,7 @@
* @param {!Blob|!File} blob The file to save.
*/
async _saveFile(blob) {
- const domain = new Common.ParsedURL(this.json.finalUrl).domain();
+ const domain = new Common.ParsedURL.ParsedURL(this.json.finalUrl).domain();
const sanitizedDomain = domain.replace(/[^a-z0-9.-]+/gi, '_');
const timestamp = new Date(this.json.fetchTime).toISO8601Compact();
const ext = blob.type.match('json') ? '.json' : '.html';
diff --git a/front_end/lighthouse/LighthouseReportSelector.js b/front_end/lighthouse/LighthouseReportSelector.js
index 0639fde..414cfed 100644
--- a/front_end/lighthouse/LighthouseReportSelector.js
+++ b/front_end/lighthouse/LighthouseReportSelector.js
@@ -2,11 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import * as Common from '../common/common.js';
+import * as UI from '../ui/ui.js';
+
export class ReportSelector {
constructor(renderNewLighthouseView) {
this._renderNewLighthouseView = renderNewLighthouseView;
this._newLighthouseItem = createElement('option');
- this._comboBox = new UI.ToolbarComboBox(this._handleChange.bind(this), ls`Reports`, 'lighthouse-report');
+ this._comboBox = new UI.Toolbar.ToolbarComboBox(this._handleChange.bind(this), ls`Reports`, 'lighthouse-report');
this._comboBox.setMaxWidth(180);
this._comboBox.setMinWidth(140);
this._itemByOptionElement = new Map();
@@ -18,7 +21,7 @@
this._comboBox.setEnabled(false);
this._newLighthouseItem = createElement('option');
- this._newLighthouseItem.label = Common.UIString('(new report)');
+ this._newLighthouseItem.label = Common.UIString.UIString('(new report)');
this._comboBox.selectElement().appendChild(this._newLighthouseItem);
this._comboBox.select(this._newLighthouseItem);
}
@@ -58,7 +61,7 @@
}
/**
- * @return {!UI.ToolbarComboBox}
+ * @return {!UI.Toolbar.ToolbarComboBox}
*/
comboBox() {
return this._comboBox;
@@ -107,7 +110,7 @@
this._renderReport = renderReport;
this._showLandingCallback = showLandingCallback;
- const url = new Common.ParsedURL(lighthouseResult.finalUrl);
+ const url = new Common.ParsedURL.ParsedURL(lighthouseResult.finalUrl);
const timestamp = lighthouseResult.fetchTime;
this._element = createElement('option');
this._element.label = `${new Date(timestamp).toLocaleTimeString()} - ${url.domain()}`;
diff --git a/front_end/lighthouse/LighthouseStartView.js b/front_end/lighthouse/LighthouseStartView.js
index 7e6d6b2..ac188bc 100644
--- a/front_end/lighthouse/LighthouseStartView.js
+++ b/front_end/lighthouse/LighthouseStartView.js
@@ -2,13 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import * as UI from '../ui/ui.js'; // eslint-disable-line no-unused-vars
+
import {Events, LighthouseController, Presets, RuntimeSettings} from './LighthouseController.js'; // eslint-disable-line no-unused-vars
import {RadioSetting} from './RadioSetting.js';
/**
* @unrestricted
*/
-export class StartView extends UI.Widget {
+export class StartView extends UI.Widget.Widget {
/**
* @param {!LighthouseController} controller
*/
@@ -16,12 +18,12 @@
super();
this.registerRequiredCSS('lighthouse/lighthouseStartView.css');
this._controller = controller;
- this._settingsToolbar = new UI.Toolbar('');
+ this._settingsToolbar = new UI.Toolbar.Toolbar('');
this._render();
}
/**
- * @return {!UI.Toolbar}
+ * @return {!UI.Toolbar.Toolbar}
*/
settingsToolbar() {
return this._settingsToolbar;
@@ -45,7 +47,7 @@
/**
* @param {string} settingName
- * @param {!UI.Toolbar} toolbar
+ * @param {!UI.Toolbar.Toolbar} toolbar
*/
_populateRuntimeSettingAsToolbarCheckbox(settingName, toolbar) {
const runtimeSetting = RuntimeSettings.find(item => item.setting.name === settingName);
@@ -54,17 +56,17 @@
}
runtimeSetting.setting.setTitle(runtimeSetting.title);
- const control = new UI.ToolbarSettingCheckbox(runtimeSetting.setting, runtimeSetting.description);
+ const control = new UI.Toolbar.ToolbarSettingCheckbox(runtimeSetting.setting, runtimeSetting.description);
toolbar.appendToolbarItem(control);
if (runtimeSetting.learnMore) {
- const link = UI.XLink.create(runtimeSetting.learnMore, ls`Learn more`, 'lighthouse-learn-more');
+ const link = UI.XLink.XLink.create(runtimeSetting.learnMore, ls`Learn more`, 'lighthouse-learn-more');
link.style.padding = '5px';
control.element.appendChild(link);
}
}
/**
- * @param {!UI.Fragment} fragment
+ * @param {!UI.Fragment.Fragment} fragment
*/
_populateFormControls(fragment) {
// Populate the device type
@@ -77,7 +79,7 @@
for (const preset of Presets) {
const formElements = preset.plugin ? pluginFormElements : categoryFormElements;
preset.setting.setTitle(preset.title);
- const checkbox = new UI.ToolbarSettingCheckbox(preset.setting);
+ const checkbox = new UI.Toolbar.ToolbarSettingCheckbox(preset.setting);
const row = formElements.createChild('div', 'vbox lighthouse-launcher-row');
row.title = preset.description;
row.appendChild(checkbox.element);
@@ -92,18 +94,18 @@
this._populateRuntimeSettingAsToolbarCheckbox('lighthouse.clear_storage', this._settingsToolbar);
this._populateRuntimeSettingAsToolbarCheckbox('lighthouse.throttling', this._settingsToolbar);
- this._startButton = UI.createTextButton(
+ this._startButton = UI.UIUtils.createTextButton(
ls`Generate report`,
() => this._controller.dispatchEventToListeners(
Events.RequestLighthouseStart,
- /* keyboardInitiated */ UI.elementIsFocusedByKeyboard(this._startButton)),
+ /* keyboardInitiated */ UI.UIUtils.elementIsFocusedByKeyboard(this._startButton)),
/* className */ '', /* primary */ true);
this.setDefaultFocusedElement(this._startButton);
const auditsDescription = ls
`Identify and fix common problems that affect your site's performance, accessibility, and user experience.`; // crbug.com/972969
- const fragment = UI.Fragment.build`
+ const fragment = UI.Fragment.Fragment.build`
<div class="vbox lighthouse-start-view">
<header>
<div class="lighthouse-logo"></div>
@@ -113,7 +115,7 @@
<div $="help-text" class="lighthouse-help-text hidden"></div>
<div class="lighthouse-start-view-text">
<span>${auditsDescription}</span>
- ${UI.XLink.create('https://developers.google.com/web/tools/lighthouse/', ls`Learn more`)}
+ ${UI.XLink.XLink.create('https://developers.google.com/web/tools/lighthouse/', ls`Learn more`)}
</div>
</header>
<form>
diff --git a/front_end/lighthouse/LighthouseStatusView.js b/front_end/lighthouse/LighthouseStatusView.js
index 2e56b2d..81b2b34 100644
--- a/front_end/lighthouse/LighthouseStatusView.js
+++ b/front_end/lighthouse/LighthouseStatusView.js
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import * as Common from '../common/common.js'; // eslint-disable-line no-unused-vars
+import * as UI from '../ui/ui.js';
+
import {Events, LighthouseController, RuntimeSettings} from './LighthouseController.js'; // eslint-disable-line no-unused-vars
export class StatusView {
@@ -25,7 +28,7 @@
this._scheduledTextChangeTimeout = null;
this._scheduledFastFactTimeout = null;
- this._dialog = new UI.Dialog();
+ this._dialog = new UI.Dialog.Dialog();
this._dialog.setDimmed(true);
this._dialog.setCloseOnEscape(false);
this._dialog.setOutsideClickCallback(event => event.consume(true));
@@ -34,11 +37,11 @@
_render() {
const dialogRoot =
- UI.createShadowRootWithCoreStyles(this._dialog.contentElement, 'lighthouse/lighthouseDialog.css');
+ UI.Utils.createShadowRootWithCoreStyles(this._dialog.contentElement, 'lighthouse/lighthouseDialog.css');
const lighthouseViewElement = dialogRoot.createChild('div', 'lighthouse-view vbox');
- const cancelButton = UI.createTextButton(ls`Cancel`, this._cancel.bind(this));
- const fragment = UI.Fragment.build`
+ const cancelButton = UI.UIUtils.createTextButton(ls`Cancel`, this._cancel.bind(this));
+ const fragment = UI.Fragment.Fragment.build`
<div class="lighthouse-view vbox">
<h2 $="status-header">Auditing your web page…</h2>
<div class="lighthouse-status vbox" $="status-view">
@@ -65,7 +68,7 @@
this._dialog.setDefaultFocusedElement(cancelButton);
this._dialog.setSizeBehavior(UI.GlassPane.SizeBehavior.SetExactWidthMaxHeight);
- this._dialog.setMaxContentSize(new UI.Size(500, 400));
+ this._dialog.setMaxContentSize(new UI.Geometry.Size(500, 400));
}
_reset() {
@@ -86,7 +89,7 @@
this._reset();
this.updateStatus(ls`Loading…`);
- const parsedURL = Common.ParsedURL.fromString(this._inspectedURL);
+ const parsedURL = Common.ParsedURL.ParsedURL.fromString(this._inspectedURL);
const pageHost = parsedURL && parsedURL.host;
const statusHeader = pageHost ? ls`Auditing ${pageHost}` : ls`Auditing your web page`;
this._renderStatusHeader(statusHeader);
@@ -122,7 +125,7 @@
}
if (message.startsWith('Cancel')) {
- this._commitTextChange(Common.UIString('Cancelling…'));
+ this._commitTextChange(Common.UIString.UIString('Cancelling…'));
clearTimeout(this._scheduledFastFactTimeout);
return;
}
@@ -131,7 +134,7 @@
const nextPhaseIndex = StatusPhases.indexOf(nextPhase);
const currentPhaseIndex = StatusPhases.indexOf(this._currentPhase);
if (!nextPhase && !this._currentPhase) {
- this._commitTextChange(Common.UIString('Lighthouse is warming up…'));
+ this._commitTextChange(Common.UIString.UIString('Lighthouse is warming up…'));
clearTimeout(this._scheduledFastFactTimeout);
} else if (nextPhase && (!this._currentPhase || currentPhaseIndex < nextPhaseIndex)) {
this._currentPhase = nextPhase;
@@ -247,9 +250,9 @@
this._progressBar.classList.add('errored');
this._commitTextChange('');
- this._statusText.createChild('p').createTextChild(Common.UIString('Ah, sorry! We ran into an error.'));
+ this._statusText.createChild('p').createTextChild(Common.UIString.UIString('Ah, sorry! We ran into an error.'));
if (KnownBugPatterns.some(pattern => pattern.test(err.message))) {
- const message = Common.UIString(
+ const message = Common.UIString.UIString(
'Try to navigate to the URL in a fresh Chrome profile without any other tabs or extensions open and try again.');
this._statusText.createChild('p').createTextChild(message);
} else {
diff --git a/front_end/lighthouse/RadioSetting.js b/front_end/lighthouse/RadioSetting.js
index eb43526..b764761 100644
--- a/front_end/lighthouse/RadioSetting.js
+++ b/front_end/lighthouse/RadioSetting.js
@@ -2,10 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+import * as Common from '../common/common.js'; // eslint-disable-line no-unused-vars
+import * as UI from '../ui/ui.js';
+
export class RadioSetting {
/**
* @param {!Array<!{value: string, label: string}>} options
- * @param {!Common.Setting} setting
+ * @param {!Common.Settings.Setting} setting
* @param {string} description
*/
constructor(options, setting, description) {
@@ -19,7 +22,7 @@
this._radioElements = [];
for (const option of this._options) {
- const fragment = UI.Fragment.build`
+ const fragment = UI.Fragment.Fragment.build`
<label $="label" class="audits-radio">
<input $="input" type="radio" value=${option.value} name=${setting.name}>
${option.label}
@@ -28,7 +31,7 @@
this.element.appendChild(fragment.element());
if (option.title) {
- UI.Tooltip.install(fragment.$('label'), option.title);
+ UI.Tooltip.Tooltip.install(fragment.$('label'), option.title);
}
const radioElement = fragment.$('input');
radioElement.addEventListener('change', this._valueChanged.bind(this));
diff --git a/front_end/main/MainImpl.js b/front_end/main/MainImpl.js
index 41e28d5..2f03517 100644
--- a/front_end/main/MainImpl.js
+++ b/front_end/main/MainImpl.js
@@ -215,7 +215,7 @@
self.Components.dockController = new Components.DockController.DockController(canDock);
self.SDK.multitargetNetworkManager = new SDK.NetworkManager.MultitargetNetworkManager();
self.SDK.domDebuggerManager = new SDK.DOMDebuggerModel.DOMDebuggerManager();
- self.SDK.targetManager.addEventListener(
+ SDK.SDKModel.TargetManager.instance().addEventListener(
SDK.SDKModel.Events.SuspendStateChanged, this._onSuspendStateChanged.bind(this));
self.UI.shortcutsScreen = new UI.ShortcutsScreen.ShortcutsScreen();
@@ -230,14 +230,14 @@
self.Bindings.networkProjectManager = new Bindings.NetworkProject.NetworkProjectManager();
self.Bindings.resourceMapping =
- new Bindings.ResourceMapping.ResourceMapping(self.SDK.targetManager, self.Workspace.workspace);
+ new Bindings.ResourceMapping.ResourceMapping(SDK.SDKModel.TargetManager.instance(), self.Workspace.workspace);
new Bindings.PresentationConsoleMessageHelper.PresentationConsoleMessageManager();
- self.Bindings.cssWorkspaceBinding =
- new Bindings.CSSWorkspaceBinding.CSSWorkspaceBinding(self.SDK.targetManager, self.Workspace.workspace);
+ self.Bindings.cssWorkspaceBinding = new Bindings.CSSWorkspaceBinding.CSSWorkspaceBinding(
+ SDK.SDKModel.TargetManager.instance(), self.Workspace.workspace);
self.Bindings.debuggerWorkspaceBinding = new Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding(
- self.SDK.targetManager, self.Workspace.workspace);
+ SDK.SDKModel.TargetManager.instance(), self.Workspace.workspace);
self.Bindings.breakpointManager = new Bindings.BreakpointManager.BreakpointManager(
- self.Workspace.workspace, self.SDK.targetManager, self.Bindings.debuggerWorkspaceBinding);
+ self.Workspace.workspace, SDK.SDKModel.TargetManager.instance(), self.Bindings.debuggerWorkspaceBinding);
self.Extensions.extensionServer = new Extensions.ExtensionServer.ExtensionServer();
new Persistence.FileSystemWorkspaceBinding.FileSystemWorkspaceBinding(
@@ -247,7 +247,7 @@
self.Persistence.networkPersistenceManager =
new Persistence.NetworkPersistenceManager.NetworkPersistenceManager(self.Workspace.workspace);
- new ExecutionContextSelector(self.SDK.targetManager, self.UI.context);
+ new ExecutionContextSelector(SDK.SDKModel.TargetManager.instance(), self.UI.context);
self.Bindings.blackboxManager =
new Bindings.BlackboxManager.BlackboxManager(self.Bindings.debuggerWorkspaceBinding);
@@ -500,7 +500,7 @@
}
_onSuspendStateChanged() {
- const suspended = self.SDK.targetManager.allTargetsSuspended();
+ const suspended = SDK.SDKModel.TargetManager.instance().allTargetsSuspended();
self.UI.inspectorView.onSuspendStateChanged(suspended);
}
}
@@ -674,7 +674,8 @@
}
if (self.Components.dockController.dockSide() === Components.DockController.State.Undocked &&
- self.SDK.targetManager.mainTarget() && self.SDK.targetManager.mainTarget().type() === SDK.SDKModel.Type.Frame) {
+ SDK.SDKModel.TargetManager.instance().mainTarget() &&
+ SDK.SDKModel.TargetManager.instance().mainTarget().type() === SDK.SDKModel.Type.Frame) {
contextMenu.defaultSection().appendAction(
'inspector_main.focus-debuggee', Common.UIString.UIString('Focus debuggee'));
}
@@ -708,7 +709,7 @@
*/
export class PauseListener {
constructor() {
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DebuggerModel.DebuggerModel, SDK.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this);
}
@@ -716,7 +717,7 @@
* @param {!Common.EventTarget.EventTargetEvent} event
*/
_debuggerPaused(event) {
- self.SDK.targetManager.removeModelListener(
+ SDK.SDKModel.TargetManager.instance().removeModelListener(
SDK.DebuggerModel.DebuggerModel, SDK.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this);
const debuggerModel = /** @type {!SDK.DebuggerModel.DebuggerModel} */ (event.data);
const debuggerPausedDetails = debuggerModel.debuggerPausedDetails();
diff --git a/front_end/media/MainView.js b/front_end/media/MainView.js
index d3b1ede..17b8ea6 100644
--- a/front_end/media/MainView.js
+++ b/front_end/media/MainView.js
@@ -25,7 +25,7 @@
this._sidebar = new PlayerListView.PlayerListView(this);
this._sidebar.show(this.panelSidebarElement());
- self.SDK.targetManager.observeModels(MediaModel.MediaModel, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(MediaModel.MediaModel, this);
}
/**
@@ -70,7 +70,7 @@
*/
wasShown() {
super.wasShown();
- for (const model of self.SDK.targetManager.models(MediaModel.MediaModel)) {
+ for (const model of SDK.SDKModel.TargetManager.instance().models(MediaModel.MediaModel)) {
this._addEventListeners(model);
}
}
@@ -79,7 +79,7 @@
* @override
*/
willHide() {
- for (const model of self.SDK.targetManager.models(MediaModel.MediaModel)) {
+ for (const model of SDK.SDKModel.TargetManager.instance().models(MediaModel.MediaModel)) {
this._removeEventListeners(model);
}
}
diff --git a/front_end/mobile_throttling/ThrottlingManager.js b/front_end/mobile_throttling/ThrottlingManager.js
index e5cc44b..fc22249 100644
--- a/front_end/mobile_throttling/ThrottlingManager.js
+++ b/front_end/mobile_throttling/ThrottlingManager.js
@@ -35,7 +35,7 @@
this._currentNetworkThrottlingConditions = self.SDK.multitargetNetworkManager.networkConditions();
});
- self.SDK.targetManager.observeModels(SDK.EmulationModel.EmulationModel, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.EmulationModel.EmulationModel, this);
}
@@ -198,7 +198,7 @@
*/
setCPUThrottlingRate(rate) {
this._cpuThrottlingRate = rate;
- for (const emulationModel of self.SDK.targetManager.models(SDK.EmulationModel.EmulationModel)) {
+ for (const emulationModel of SDK.SDKModel.TargetManager.instance().models(SDK.EmulationModel.EmulationModel)) {
emulationModel.setCPUThrottlingRate(this._cpuThrottlingRate);
}
let icon = null;
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;
}
diff --git a/front_end/node_main/NodeMain.js b/front_end/node_main/NodeMain.js
index 4e36b22..76ca1e8 100644
--- a/front_end/node_main/NodeMain.js
+++ b/front_end/node_main/NodeMain.js
@@ -18,7 +18,7 @@
run() {
Host.userMetrics.actionTaken(Host.UserMetrics.Action.ConnectToNodeJSFromFrontend);
SDK.Connections.initMainConnection(() => {
- const target = self.SDK.targetManager.createTarget(
+ const target = SDK.SDKModel.TargetManager.instance().createTarget(
'main', Common.UIString.UIString('Main'), SDK.SDKModel.Type.Browser, null);
target.setInspectedURL('Node.js');
}, Components.TargetDetachedDialog.TargetDetachedDialog.webSocketConnectionLost);
diff --git a/front_end/object_ui/JavaScriptAutocomplete.js b/front_end/object_ui/JavaScriptAutocomplete.js
index f4b396c..00ba904 100644
--- a/front_end/object_ui/JavaScriptAutocomplete.js
+++ b/front_end/object_ui/JavaScriptAutocomplete.js
@@ -15,9 +15,9 @@
this._expressionCache = new Map();
self.SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.CommandEvaluated, this._clearCache, this);
self.UI.context.addFlavorChangeListener(SDK.RuntimeModel.ExecutionContext, this._clearCache, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DebuggerModel.DebuggerModel, SDK.DebuggerModel.Events.DebuggerResumed, this._clearCache, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DebuggerModel.DebuggerModel, SDK.DebuggerModel.Events.DebuggerPaused, this._clearCache, this);
}
diff --git a/front_end/perf_ui/GCActionDelegate.js b/front_end/perf_ui/GCActionDelegate.js
index 0b41094..7bad62a 100644
--- a/front_end/perf_ui/GCActionDelegate.js
+++ b/front_end/perf_ui/GCActionDelegate.js
@@ -16,7 +16,8 @@
* @return {boolean}
*/
handleAction(context, actionId) {
- for (const heapProfilerModel of self.SDK.targetManager.models(SDK.HeapProfilerModel.HeapProfilerModel)) {
+ for (const heapProfilerModel of SDK.SDKModel.TargetManager.instance().models(
+ SDK.HeapProfilerModel.HeapProfilerModel)) {
heapProfilerModel.collectGarbage();
}
return true;
diff --git a/front_end/perf_ui/LiveHeapProfile.js b/front_end/perf_ui/LiveHeapProfile.js
index 60e2463..01d9a2c 100644
--- a/front_end/perf_ui/LiveHeapProfile.js
+++ b/front_end/perf_ui/LiveHeapProfile.js
@@ -52,12 +52,12 @@
}
this._running = true;
const sessionId = this._sessionId;
- self.SDK.targetManager.observeModels(SDK.HeapProfilerModel.HeapProfilerModel, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.HeapProfilerModel.HeapProfilerModel, this);
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.Load, this._loadEventFired, this);
do {
- const models = self.SDK.targetManager.models(SDK.HeapProfilerModel.HeapProfilerModel);
+ const models = SDK.SDKModel.TargetManager.instance().models(SDK.HeapProfilerModel.HeapProfilerModel);
const profiles = await Promise.all(models.map(model => model.getSamplingProfile()));
if (sessionId !== this._sessionId) {
break;
@@ -75,10 +75,10 @@
]);
} while (sessionId === this._sessionId);
- self.SDK.targetManager.unobserveModels(SDK.HeapProfilerModel.HeapProfilerModel, this);
- self.SDK.targetManager.removeModelListener(
+ SDK.SDKModel.TargetManager.instance().unobserveModels(SDK.HeapProfilerModel.HeapProfilerModel, this);
+ SDK.SDKModel.TargetManager.instance().removeModelListener(
SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.Load, this._loadEventFired, this);
- for (const model of self.SDK.targetManager.models(SDK.HeapProfilerModel.HeapProfilerModel)) {
+ for (const model of SDK.SDKModel.TargetManager.instance().models(SDK.HeapProfilerModel.HeapProfilerModel)) {
model.stopSampling();
}
self.runtime.sharedInstance(Memory).reset();
diff --git a/front_end/performance_monitor/PerformanceMonitor.js b/front_end/performance_monitor/PerformanceMonitor.js
index 4ec74f0..e2e8b3f 100644
--- a/front_end/performance_monitor/PerformanceMonitor.js
+++ b/front_end/performance_monitor/PerformanceMonitor.js
@@ -38,7 +38,7 @@
this.contentElement.createChild('div', 'perfmon-chart-suspend-overlay fill').createChild('div').textContent =
Common.UIString.UIString('Paused');
this._controlPane.addEventListener(Events.MetricChanged, this._recalcChartHeight, this);
- self.SDK.targetManager.observeModels(SDK.PerformanceMetricsModel.PerformanceMetricsModel, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.PerformanceMetricsModel.PerformanceMetricsModel, this);
}
/**
@@ -48,7 +48,8 @@
if (!this._model) {
return;
}
- self.SDK.targetManager.addEventListener(SDK.SDKModel.Events.SuspendStateChanged, this._suspendStateChanged, this);
+ SDK.SDKModel.TargetManager.instance().addEventListener(
+ SDK.SDKModel.Events.SuspendStateChanged, this._suspendStateChanged, this);
this._model.enable();
this._suspendStateChanged();
}
@@ -60,7 +61,7 @@
if (!this._model) {
return;
}
- self.SDK.targetManager.removeEventListener(
+ SDK.SDKModel.TargetManager.instance().removeEventListener(
SDK.SDKModel.Events.SuspendStateChanged, this._suspendStateChanged, this);
this._stopPolling();
this._model.disable();
@@ -95,7 +96,7 @@
}
_suspendStateChanged() {
- const suspended = self.SDK.targetManager.allTargetsSuspended();
+ const suspended = SDK.SDKModel.TargetManager.instance().allTargetsSuspended();
if (suspended) {
this._stopPolling();
} else {
diff --git a/front_end/persistence/NetworkPersistenceManager.js b/front_end/persistence/NetworkPersistenceManager.js
index cb0d7b9..e161852 100644
--- a/front_end/persistence/NetworkPersistenceManager.js
+++ b/front_end/persistence/NetworkPersistenceManager.js
@@ -137,7 +137,8 @@
async _updateActiveProject() {
const wasActive = this._active;
- this._active = !!(this._enabledSetting.get() && self.SDK.targetManager.mainTarget() && this._project);
+ this._active =
+ !!(this._enabledSetting.get() && SDK.SDKModel.TargetManager.instance().mainTarget() && this._project);
if (this._active === wasActive) {
return;
}
diff --git a/front_end/profiler/CPUProfileView.js b/front_end/profiler/CPUProfileView.js
index e3d4851..b8cbb19 100644
--- a/front_end/profiler/CPUProfileView.js
+++ b/front_end/profiler/CPUProfileView.js
@@ -96,7 +96,7 @@
this._recording = false;
CPUProfileType.instance = this;
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.CPUProfilerModel.CPUProfilerModel, SDK.CPUProfilerModel.Events.ConsoleProfileFinished,
this._consoleProfileFinished, this);
}
@@ -179,7 +179,7 @@
}
const profile = new CPUProfileHeader(cpuProfilerModel, this);
this.setProfileBeingRecorded(profile);
- self.SDK.targetManager.suspendAllTargets();
+ SDK.SDKModel.TargetManager.instance().suspendAllTargets();
this.addProfile(profile);
profile.updateStatus(Common.UIString.UIString('Recording…'));
this._recording = true;
@@ -202,7 +202,7 @@
this.setProfileBeingRecorded(null);
}
- await self.SDK.targetManager.resumeAllTargets();
+ await SDK.SDKModel.TargetManager.instance().resumeAllTargets();
this.dispatchEventToListeners(ProfileEvents.ProfileComplete, recordedProfile);
}
diff --git a/front_end/profiler/HeapSnapshotView.js b/front_end/profiler/HeapSnapshotView.js
index 28b123b..8bbf452 100644
--- a/front_end/profiler/HeapSnapshotView.js
+++ b/front_end/profiler/HeapSnapshotView.js
@@ -1075,13 +1075,13 @@
*/
constructor(id, title) {
super(id || HeapSnapshotProfileType.TypeId, title || ls`Heap snapshot`);
- self.SDK.targetManager.observeModels(SDK.HeapProfilerModel.HeapProfilerModel, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.HeapProfilerModel.HeapProfilerModel, this);
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.HeapProfilerModel.HeapProfilerModel, SDK.HeapProfilerModel.Events.ResetProfiles, this._resetProfiles, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.HeapProfilerModel.HeapProfilerModel, SDK.HeapProfilerModel.Events.AddHeapSnapshotChunk,
this._addHeapSnapshotChunk, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.HeapProfilerModel.HeapProfilerModel, SDK.HeapProfilerModel.Events.ReportHeapSnapshotProgress,
this._reportHeapSnapshotProgress, this);
this._treatGlobalObjectsAsRoots = self.Common.settings.createSetting('treatGlobalObjectsAsRoots', true);
diff --git a/front_end/profiler/IsolateSelector.js b/front_end/profiler/IsolateSelector.js
index 9efbc6d..c903d18 100644
--- a/front_end/profiler/IsolateSelector.js
+++ b/front_end/profiler/IsolateSelector.js
@@ -35,8 +35,9 @@
this._totalValueDiv.title = ls`Total page JS heap size across all VM instances.`;
self.SDK.isolateManager.observeIsolates(this);
- self.SDK.targetManager.addEventListener(SDK.SDKModel.Events.NameChanged, this._targetChanged, this);
- self.SDK.targetManager.addEventListener(SDK.SDKModel.Events.InspectedURLChanged, this._targetChanged, this);
+ SDK.SDKModel.TargetManager.instance().addEventListener(SDK.SDKModel.Events.NameChanged, this._targetChanged, this);
+ SDK.SDKModel.TargetManager.instance().addEventListener(
+ SDK.SDKModel.Events.InspectedURLChanged, this._targetChanged, this);
}
/**
@@ -59,7 +60,7 @@
*/
isolateAdded(isolate) {
const item = new ListItem(isolate);
- const index = item.model().target() === self.SDK.targetManager.mainTarget() ? 0 : this._items.length;
+ const index = item.model().target() === SDK.SDKModel.TargetManager.instance().mainTarget() ? 0 : this._items.length;
this._items.insert(index, item);
this._itemByIsolate.set(isolate, item);
if (this._items.length === 1 || isolate.isMainThread()) {
@@ -256,7 +257,7 @@
const modelCountByName = new Map();
for (const model of this._isolate.models()) {
const target = model.target();
- const name = self.SDK.targetManager.mainTarget() !== target ? target.name() : '';
+ const name = SDK.SDKModel.TargetManager.instance().mainTarget() !== target ? target.name() : '';
const parsedURL = new Common.ParsedURL.ParsedURL(target.inspectedURL());
const domain = parsedURL.isValid ? parsedURL.domain() : '';
const title = target.decorateLabel(domain && name ? `${domain}: ${name}` : name || domain || ls`(empty)`);
diff --git a/front_end/profiler/LiveHeapProfileView.js b/front_end/profiler/LiveHeapProfileView.js
index 646a318..035a385 100644
--- a/front_end/profiler/LiveHeapProfileView.js
+++ b/front_end/profiler/LiveHeapProfileView.js
@@ -28,7 +28,7 @@
this._toggleRecordButton.setToggled(this._setting.get());
toolbar.appendToolbarItem(this._toggleRecordButton);
- const mainTarget = self.SDK.targetManager.mainTarget();
+ const mainTarget = SDK.SDKModel.TargetManager.instance().mainTarget();
if (mainTarget && mainTarget.model(SDK.ResourceTreeModel.ResourceTreeModel)) {
const startWithReloadAction =
/** @type {!UI.Action.Action }*/ (self.UI.actionRegistry.action('live-heap-profile.start-with-reload'));
@@ -252,7 +252,7 @@
if (!reload) {
return;
}
- const mainTarget = self.SDK.targetManager.mainTarget();
+ const mainTarget = SDK.SDKModel.TargetManager.instance().mainTarget();
if (!mainTarget) {
return;
}
diff --git a/front_end/profiler/ProfilesPanel.js b/front_end/profiler/ProfilesPanel.js
index 1728f8b..50316b2 100644
--- a/front_end/profiler/ProfilesPanel.js
+++ b/front_end/profiler/ProfilesPanel.js
@@ -109,7 +109,8 @@
this._createFileSelectorElement();
this.element.addEventListener('contextmenu', this._handleContextMenuEvent.bind(this), false);
- self.SDK.targetManager.addEventListener(SDK.SDKModel.Events.SuspendStateChanged, this._onSuspendStateChanged, this);
+ SDK.SDKModel.TargetManager.instance().addEventListener(
+ SDK.SDKModel.Events.SuspendStateChanged, this._onSuspendStateChanged, this);
self.UI.context.addFlavorChangeListener(
SDK.CPUProfilerModel.CPUProfilerModel, this._updateProfileTypeSpecificUI, this);
self.UI.context.addFlavorChangeListener(
@@ -219,7 +220,7 @@
const hasSelectedTarget =
!!(self.UI.context.flavor(SDK.CPUProfilerModel.CPUProfilerModel) ||
self.UI.context.flavor(SDK.HeapProfilerModel.HeapProfilerModel));
- const enable = toggled || (!self.SDK.targetManager.allTargetsSuspended() && hasSelectedTarget);
+ const enable = toggled || (!SDK.SDKModel.TargetManager.instance().allTargetsSuspended() && hasSelectedTarget);
this._toggleRecordAction.setEnabled(enable);
this._toggleRecordAction.setToggled(toggled);
if (enable) {
diff --git a/front_end/protocol_monitor/ProtocolMonitor.js b/front_end/protocol_monitor/ProtocolMonitor.js
index 726bbe6..e7b2eca 100644
--- a/front_end/protocol_monitor/ProtocolMonitor.js
+++ b/front_end/protocol_monitor/ProtocolMonitor.js
@@ -207,7 +207,7 @@
return '';
}
return target.decorateLabel(
- `${target.name()} ${target === self.SDK.targetManager.mainTarget() ? '' : target.id()}`);
+ `${target.name()} ${target === SDK.SDKModel.TargetManager.instance().mainTarget() ? '' : target.id()}`);
}
/**
diff --git a/front_end/resources/AppManifestView.js b/front_end/resources/AppManifestView.js
index a3b6c29..af93629 100644
--- a/front_end/resources/AppManifestView.js
+++ b/front_end/resources/AppManifestView.js
@@ -54,7 +54,7 @@
this._displayField = this._presentationSection.appendField(Common.UIString.UIString('Display'));
this._throttler = new Common.Throttler.Throttler(1000);
- self.SDK.targetManager.observeTargets(this);
+ SDK.SDKModel.TargetManager.instance().observeTargets(this);
}
/**
diff --git a/front_end/resources/ApplicationPanelSidebar.js b/front_end/resources/ApplicationPanelSidebar.js
index 3eac4b9..3acc4c8 100644
--- a/front_end/resources/ApplicationPanelSidebar.js
+++ b/front_end/resources/ApplicationPanelSidebar.js
@@ -172,8 +172,8 @@
this._sidebarTree.contentElement.addEventListener('mousemove', this._onmousemove.bind(this), false);
this._sidebarTree.contentElement.addEventListener('mouseleave', this._onmouseleave.bind(this), false);
- self.SDK.targetManager.observeTargets(this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().observeTargets(this);
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.FrameNavigated, this._frameNavigated,
this);
@@ -273,12 +273,13 @@
if (resourceTreeModel) {
this._populateApplicationCacheTree(resourceTreeModel);
}
- self.SDK.targetManager.observeModels(DOMStorageModel, /** @type {!SDK.SDKModel.SDKModelObserver} */ ({
- modelAdded: model => this._domStorageModelAdded(model),
- modelRemoved: model => this._domStorageModelRemoved(model)
- }));
+ SDK.SDKModel.TargetManager.instance().observeModels(
+ DOMStorageModel, /** @type {!SDK.SDKModel.SDKModelObserver} */ ({
+ modelAdded: model => this._domStorageModelAdded(model),
+ modelRemoved: model => this._domStorageModelRemoved(model)
+ }));
this.indexedDBListTreeElement._initialize();
- self.SDK.targetManager.observeModels(
+ SDK.SDKModel.TargetManager.instance().observeModels(
IndexedDBModel, /** @type {!SDK.SDKModel.SDKModelObserver} */ ({
modelAdded: model => model.enable(),
modelRemoved: model => this.indexedDBListTreeElement.removeIndexedDBForModel(model)
@@ -1007,10 +1008,10 @@
this._addCache(model, cache);
}
}
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.ServiceWorkerCacheModel.ServiceWorkerCacheModel, SDK.ServiceWorkerCacheModel.Events.CacheAdded,
this._cacheAdded, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.ServiceWorkerCacheModel.ServiceWorkerCacheModel, SDK.ServiceWorkerCacheModel.Events.CacheRemoved,
this._cacheRemoved, this);
}
@@ -1276,18 +1277,18 @@
}
_initialize() {
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
IndexedDBModel, IndexedDBModelEvents.DatabaseAdded, this._indexedDBAdded, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
IndexedDBModel, IndexedDBModelEvents.DatabaseRemoved, this._indexedDBRemoved, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
IndexedDBModel, IndexedDBModelEvents.DatabaseLoaded, this._indexedDBLoaded, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
IndexedDBModel, IndexedDBModelEvents.IndexedDBContentUpdated, this._indexedDBContentUpdated, this);
/** @type {!Array.<!IDBDatabaseTreeElement>} */
this._idbDatabaseTreeElements = [];
- for (const indexedDBModel of self.SDK.targetManager.models(IndexedDBModel)) {
+ for (const indexedDBModel of SDK.SDKModel.TargetManager.instance().models(IndexedDBModel)) {
const databases = indexedDBModel.databases();
for (let j = 0; j < databases.length; ++j) {
this._addIndexedDB(indexedDBModel, databases[j]);
@@ -1321,7 +1322,7 @@
}
refreshIndexedDB() {
- for (const indexedDBModel of self.SDK.targetManager.models(IndexedDBModel)) {
+ for (const indexedDBModel of SDK.SDKModel.TargetManager.instance().models(IndexedDBModel)) {
indexedDBModel.refreshDatabaseNames();
}
}
@@ -2014,7 +2015,7 @@
this._treeElementForFrameId = new Map();
function addListener(eventType, handler, target) {
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.ResourceTreeModel.ResourceTreeModel, eventType, event => handler.call(target, event.data));
}
addListener(SDK.ResourceTreeModel.Events.FrameAdded, this._frameAdded, this);
@@ -2022,7 +2023,7 @@
addListener(SDK.ResourceTreeModel.Events.FrameDetached, this._frameDetached, this);
addListener(SDK.ResourceTreeModel.Events.ResourceAdded, this._resourceAdded, this);
- const mainTarget = self.SDK.targetManager.mainTarget();
+ const mainTarget = SDK.SDKModel.TargetManager.instance().mainTarget();
const resourceTreeModel = mainTarget && mainTarget.model(SDK.ResourceTreeModel.ResourceTreeModel);
const mainFrame = resourceTreeModel && resourceTreeModel.mainFrame;
if (mainFrame) {
diff --git a/front_end/resources/ClearStorageView.js b/front_end/resources/ClearStorageView.js
index cd63182..3783d90 100644
--- a/front_end/resources/ClearStorageView.js
+++ b/front_end/resources/ClearStorageView.js
@@ -77,7 +77,7 @@
this._appendItem(caches, Common.UIString.UIString('Application cache'), 'appcache');
caches.markFieldListAsGroup();
- self.SDK.targetManager.observeTargets(this);
+ SDK.SDKModel.TargetManager.instance().observeTargets(this);
}
/**
@@ -187,7 +187,7 @@
}
if (set.has(Protocol.Storage.StorageType.Indexeddb) || hasAll) {
- for (const target of self.SDK.targetManager.targets()) {
+ for (const target of SDK.SDKModel.TargetManager.instance().targets()) {
const indexedDBModel = target.model(IndexedDBModel);
if (indexedDBModel) {
indexedDBModel.clearForOrigin(securityOrigin);
@@ -211,7 +211,7 @@
}
if (set.has(Protocol.Storage.StorageType.Cache_storage) || hasAll) {
- const target = self.SDK.targetManager.mainTarget();
+ const target = SDK.SDKModel.TargetManager.instance().mainTarget();
const model = target && target.model(SDK.ServiceWorkerCacheModel.ServiceWorkerCacheModel);
if (model) {
model.clearForOrigin(securityOrigin);
@@ -336,7 +336,7 @@
* @return {boolean}
*/
_handleClear() {
- const target = self.SDK.targetManager.mainTarget();
+ const target = SDK.SDKModel.TargetManager.instance().mainTarget();
if (!target) {
return false;
}
diff --git a/front_end/resources/ServiceWorkersView.js b/front_end/resources/ServiceWorkersView.js
index 3b3f808..3ebd1ba 100644
--- a/front_end/resources/ServiceWorkersView.js
+++ b/front_end/resources/ServiceWorkersView.js
@@ -77,7 +77,7 @@
/** @type {!Map<!SDK.ServiceWorkerManager.ServiceWorkerManager, !Array<!Common.EventTarget.EventDescriptor>>}*/
this._eventListeners = new Map();
- self.SDK.targetManager.observeModels(SDK.ServiceWorkerManager.ServiceWorkerManager, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.ServiceWorkerManager.ServiceWorkerManager, this);
this._updateListVisibility();
}
@@ -414,7 +414,7 @@
if (!version || !version.targetId) {
return null;
}
- return self.SDK.targetManager.targetById(version.targetId);
+ return SDK.SDKModel.TargetManager.instance().targetById(version.targetId);
}
/**
diff --git a/front_end/screencast/ScreencastApp.js b/front_end/screencast/ScreencastApp.js
index fd09d8b..1fa1845 100644
--- a/front_end/screencast/ScreencastApp.js
+++ b/front_end/screencast/ScreencastApp.js
@@ -23,7 +23,7 @@
this._toggleButton.setToggled(this._enabledSetting.get());
this._toggleButton.setEnabled(false);
this._toggleButton.addEventListener(UI.Toolbar.ToolbarButton.Events.Click, this._toggleButtonClicked, this);
- self.SDK.targetManager.observeModels(SDK.ScreenCaptureModel.ScreenCaptureModel, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.ScreenCaptureModel.ScreenCaptureModel, this);
}
/**
diff --git a/front_end/screencast/ScreencastView.js b/front_end/screencast/ScreencastView.js
index 30e8873..d3d13cb 100644
--- a/front_end/screencast/ScreencastView.js
+++ b/front_end/screencast/ScreencastView.js
@@ -100,7 +100,8 @@
this._shortcuts[UI.KeyboardShortcut.KeyboardShortcut.makeKey('l', UI.KeyboardShortcut.Modifiers.Ctrl)] =
this._focusNavigationBar.bind(this);
- self.SDK.targetManager.addEventListener(SDK.SDKModel.Events.SuspendStateChanged, this._onSuspendStateChange, this);
+ SDK.SDKModel.TargetManager.instance().addEventListener(
+ SDK.SDKModel.Events.SuspendStateChanged, this._onSuspendStateChange, this);
this._updateGlasspane();
}
@@ -119,7 +120,7 @@
}
_startCasting() {
- if (self.SDK.targetManager.allTargetsSuspended()) {
+ if (SDK.SDKModel.TargetManager.instance().allTargetsSuspended()) {
return;
}
if (this._isCasting) {
@@ -140,7 +141,7 @@
'jpeg', 80, Math.floor(Math.min(maxImageDimension, dimensions.width)),
Math.floor(Math.min(maxImageDimension, dimensions.height)), undefined, this._screencastFrame.bind(this),
this._screencastVisibilityChanged.bind(this));
- for (const emulationModel of self.SDK.targetManager.models(SDK.EmulationModel.EmulationModel)) {
+ for (const emulationModel of SDK.SDKModel.TargetManager.instance().models(SDK.EmulationModel.EmulationModel)) {
emulationModel.overrideEmulateTouch(true);
}
if (this._overlayModel) {
@@ -154,7 +155,7 @@
}
this._isCasting = false;
this._screenCaptureModel.stopScreencast();
- for (const emulationModel of self.SDK.targetManager.models(SDK.EmulationModel.EmulationModel)) {
+ for (const emulationModel of SDK.SDKModel.TargetManager.instance().models(SDK.EmulationModel.EmulationModel)) {
emulationModel.overrideEmulateTouch(false);
}
if (this._overlayModel) {
@@ -209,7 +210,7 @@
* @param {!Common.EventTarget.EventTargetEvent} event
*/
_onSuspendStateChange(event) {
- if (self.SDK.targetManager.allTargetsSuspended()) {
+ if (SDK.SDKModel.TargetManager.instance().allTargetsSuspended()) {
this._stopCasting();
} else {
this._startCasting();
@@ -221,7 +222,7 @@
if (this._targetInactive) {
this._glassPaneElement.textContent = Common.UIString.UIString('The tab is inactive');
this._glassPaneElement.classList.remove('hidden');
- } else if (self.SDK.targetManager.allTargetsSuspended()) {
+ } else if (SDK.SDKModel.TargetManager.instance().allTargetsSuspended()) {
this._glassPaneElement.textContent = Common.UIString.UIString('Profiling in progress');
this._glassPaneElement.classList.remove('hidden');
} else {
diff --git a/front_end/sdk/ChildTargetManager.js b/front_end/sdk/ChildTargetManager.js
index ace97fd..125e082 100644
--- a/front_end/sdk/ChildTargetManager.js
+++ b/front_end/sdk/ChildTargetManager.js
@@ -7,7 +7,7 @@
import * as ProtocolModule from '../protocol/protocol.js'; // eslint-disable-line no-unused-vars
import {ParallelConnection} from './Connections.js';
-import {Capability, Events, SDKModel, Target, Type} from './SDKModel.js'; // eslint-disable-line no-unused-vars
+import {Capability, Events, SDKModel, Target, TargetManager, Type} from './SDKModel.js'; // eslint-disable-line no-unused-vars
let _lastAnonymousTargetId = 0;
@@ -116,7 +116,7 @@
}
_fireAvailableTargetsChanged() {
- self.SDK.targetManager.dispatchEventToListeners(Events.AvailableTargetsChanged, [...this._targetInfos.values()]);
+ TargetManager.instance().dispatchEventToListeners(Events.AvailableTargetsChanged, [...this._targetInfos.values()]);
}
/**
diff --git a/front_end/sdk/Connections.js b/front_end/sdk/Connections.js
index 6f3747d..746744f 100644
--- a/front_end/sdk/Connections.js
+++ b/front_end/sdk/Connections.js
@@ -6,6 +6,8 @@
import * as Host from '../host/host.js';
import * as ProtocolModule from '../protocol/protocol.js';
+import {TargetManager} from './SDKModel.js';
+
/**
* @implements {ProtocolModule.InspectorBackend.Connection}
*/
@@ -330,7 +332,7 @@
Host.InspectorFrontendHost.InspectorFrontendHostInstance.connectionReady();
Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.addEventListener(
Host.InspectorFrontendHostAPI.Events.ReattachMainTarget, () => {
- self.SDK.targetManager.mainTarget().router().connection().disconnect();
+ TargetManager.instance().mainTarget().router().connection().disconnect();
createMainTarget();
});
return Promise.resolve();
diff --git a/front_end/sdk/ConsoleModel.js b/front_end/sdk/ConsoleModel.js
index cb62ad5..dd06651 100644
--- a/front_end/sdk/ConsoleModel.js
+++ b/front_end/sdk/ConsoleModel.js
@@ -37,7 +37,7 @@
import {RemoteObject} from './RemoteObject.js';
import {Events as ResourceTreeModelEvents, ResourceTreeModel} from './ResourceTreeModel.js';
import {Events as RuntimeModelEvents, ExecutionContext, RuntimeModel} from './RuntimeModel.js'; // eslint-disable-line no-unused-vars
-import {Observer, Target} from './SDKModel.js'; // eslint-disable-line no-unused-vars
+import {Observer, Target, TargetManager} from './SDKModel.js'; // eslint-disable-line no-unused-vars
const _events = Symbol('SDK.ConsoleModel.events');
@@ -57,7 +57,7 @@
this._violations = 0;
this._pageLoadSequenceNumber = 0;
- self.SDK.targetManager.observeTargets(this);
+ TargetManager.instance().observeTargets(this);
}
/**
@@ -349,10 +349,10 @@
}
requestClearMessages() {
- for (const logModel of self.SDK.targetManager.models(LogModel)) {
+ for (const logModel of TargetManager.instance().models(LogModel)) {
logModel.requestClear();
}
- for (const runtimeModel of self.SDK.targetManager.models(RuntimeModel)) {
+ for (const runtimeModel of TargetManager.instance().models(RuntimeModel)) {
runtimeModel.discardConsoleEntries();
}
this._clear();
diff --git a/front_end/sdk/DOMDebuggerModel.js b/front_end/sdk/DOMDebuggerModel.js
index 79c3988..c19cebe 100644
--- a/front_end/sdk/DOMDebuggerModel.js
+++ b/front_end/sdk/DOMDebuggerModel.js
@@ -8,7 +8,7 @@
import {DOMModel, DOMNode, Events as DOMModelEvents} from './DOMModel.js'; // eslint-disable-line no-unused-vars
import {RemoteObject} from './RemoteObject.js';
import {RuntimeModel} from './RuntimeModel.js';
-import {Capability, SDKModel, SDKModelObserver, Target} from './SDKModel.js'; // eslint-disable-line no-unused-vars
+import {Capability, SDKModel, SDKModelObserver, Target, TargetManager} from './SDKModel.js'; // eslint-disable-line no-unused-vars
export class DOMDebuggerModel extends SDKModel {
/**
@@ -543,7 +543,7 @@
return;
}
this._enabled = enabled;
- for (const model of self.SDK.targetManager.models(DOMDebuggerModel)) {
+ for (const model of TargetManager.instance().models(DOMDebuggerModel)) {
this._updateOnModel(model);
}
}
@@ -712,7 +712,7 @@
this._resolveEventListenerBreakpoint('instrumentation:audioContextSuspended')._title =
Common.UIString.UIString('Suspend AudioContext');
- self.SDK.targetManager.observeModels(DOMDebuggerModel, this);
+ TargetManager.instance().observeModels(DOMDebuggerModel, this);
}
/**
@@ -836,7 +836,7 @@
addXHRBreakpoint(url, enabled) {
this._xhrBreakpoints.set(url, enabled);
if (enabled) {
- for (const model of self.SDK.targetManager.models(DOMDebuggerModel)) {
+ for (const model of TargetManager.instance().models(DOMDebuggerModel)) {
model._agent.setXHRBreakpoint(url);
}
}
@@ -850,7 +850,7 @@
const enabled = this._xhrBreakpoints.get(url);
this._xhrBreakpoints.delete(url);
if (enabled) {
- for (const model of self.SDK.targetManager.models(DOMDebuggerModel)) {
+ for (const model of TargetManager.instance().models(DOMDebuggerModel)) {
model._agent.removeXHRBreakpoint(url);
}
}
@@ -863,7 +863,7 @@
*/
toggleXHRBreakpoint(url, enabled) {
this._xhrBreakpoints.set(url, enabled);
- for (const model of self.SDK.targetManager.models(DOMDebuggerModel)) {
+ for (const model of TargetManager.instance().models(DOMDebuggerModel)) {
if (enabled) {
model._agent.setXHRBreakpoint(url);
} else {
diff --git a/front_end/sdk/DOMModel.js b/front_end/sdk/DOMModel.js
index 548e1f2..dc10a93 100644
--- a/front_end/sdk/DOMModel.js
+++ b/front_end/sdk/DOMModel.js
@@ -37,7 +37,7 @@
import {OverlayModel} from './OverlayModel.js';
import {RemoteObject} from './RemoteObject.js'; // eslint-disable-line no-unused-vars
import {RuntimeModel} from './RuntimeModel.js';
-import {Capability, SDKModel, Target} from './SDKModel.js'; // eslint-disable-line no-unused-vars
+import {Capability, SDKModel, Target, TargetManager} from './SDKModel.js'; // eslint-disable-line no-unused-vars
/**
* @unrestricted
@@ -128,7 +128,7 @@
this._contentDocument.parentNode = this;
this._children = [];
} else if ((payload.nodeName === 'IFRAME' || payload.nodeName === 'PORTAL') && payload.frameId) {
- const childTarget = self.SDK.targetManager.targetById(payload.frameId);
+ const childTarget = TargetManager.instance().targetById(payload.frameId);
const childModel = childTarget ? childTarget.model(DOMModel) : null;
if (childModel) {
this._childDocumentPromiseForTesting = childModel.requestDocument();
@@ -1232,7 +1232,7 @@
}
static cancelSearch() {
- for (const domModel of self.SDK.targetManager.models(DOMModel)) {
+ for (const domModel of TargetManager.instance().models(DOMModel)) {
domModel._cancelSearch();
}
}
diff --git a/front_end/sdk/IsolateManager.js b/front_end/sdk/IsolateManager.js
index 5c7b939..66647e6 100644
--- a/front_end/sdk/IsolateManager.js
+++ b/front_end/sdk/IsolateManager.js
@@ -6,7 +6,7 @@
import {HeapProfilerModel} from './HeapProfilerModel.js'; // eslint-disable-line no-unused-vars
import {RuntimeModel} from './RuntimeModel.js';
-import {SDKModelObserver} from './SDKModel.js'; // eslint-disable-line no-unused-vars
+import {SDKModelObserver, TargetManager} from './SDKModel.js'; // eslint-disable-line no-unused-vars
/**
* @implements {SDKModelObserver}
@@ -22,7 +22,7 @@
this._isolateIdByModel = new Map();
/** @type {!Set<!Observer>} */
this._observers = new Set();
- self.SDK.targetManager.observeModels(RuntimeModel, this);
+ TargetManager.instance().observeModels(RuntimeModel, this);
this._pollId = 0;
}
diff --git a/front_end/sdk/NetworkLog.js b/front_end/sdk/NetworkLog.js
index b5d526f..2739f98 100644
--- a/front_end/sdk/NetworkLog.js
+++ b/front_end/sdk/NetworkLog.js
@@ -35,7 +35,7 @@
import {Events as NetworkRequestEvents, InitiatorType, NetworkRequest} from './NetworkRequest.js'; // eslint-disable-line no-unused-vars
import {Events as ResourceTreeModelEvents, ResourceTreeFrame, ResourceTreeModel} from './ResourceTreeModel.js'; // eslint-disable-line no-unused-vars
import {RuntimeModel} from './RuntimeModel.js';
-import {SDKModelObserver} from './SDKModel.js'; // eslint-disable-line no-unused-vars
+import {SDKModelObserver, TargetManager} from './SDKModel.js'; // eslint-disable-line no-unused-vars
/**
* @implements {SDKModelObserver<!NetworkManager>}
@@ -50,7 +50,7 @@
/** @type {!Map<!NetworkManager, !PageLoad>} */
this._pageLoadForManager = new Map();
this._isRecording = true;
- self.SDK.targetManager.observeModels(NetworkManager, this);
+ TargetManager.instance().observeModels(NetworkManager, this);
}
/**
@@ -108,10 +108,10 @@
}
this._isRecording = enabled;
if (enabled) {
- self.SDK.targetManager.observeModels(NetworkManager, this);
+ TargetManager.instance().observeModels(NetworkManager, this);
} else {
- self.SDK.targetManager.unobserveModels(NetworkManager, this);
- self.SDK.targetManager.models(NetworkManager).forEach(this._removeNetworkManagerListeners.bind(this));
+ TargetManager.instance().unobserveModels(NetworkManager, this);
+ TargetManager.instance().models(NetworkManager).forEach(this._removeNetworkManagerListeners.bind(this));
}
}
@@ -457,7 +457,7 @@
reset() {
this._requests = [];
this._requestsSet.clear();
- const managers = new Set(self.SDK.targetManager.models(NetworkManager));
+ const managers = new Set(TargetManager.instance().models(NetworkManager));
for (const manager of this._pageLoadForManager.keys()) {
if (!managers.has(manager)) {
this._pageLoadForManager.delete(manager);
diff --git a/front_end/sdk/NetworkManager.js b/front_end/sdk/NetworkManager.js
index 310f769..43ee462 100644
--- a/front_end/sdk/NetworkManager.js
+++ b/front_end/sdk/NetworkManager.js
@@ -35,7 +35,7 @@
import {Cookie} from './Cookie.js';
import {ContentData, Events as NetworkRequestEvents, ExtraRequestInfo, ExtraResponseInfo, NameValue, NetworkRequest} from './NetworkRequest.js'; // eslint-disable-line no-unused-vars
-import {Capability, SDKModel, SDKModelObserver, Target} from './SDKModel.js'; // eslint-disable-line no-unused-vars
+import {Capability, SDKModel, SDKModelObserver, Target, TargetManager} from './SDKModel.js'; // eslint-disable-line no-unused-vars
/**
* @unrestricted
@@ -1032,7 +1032,7 @@
/** @type {!Platform.Multimap<!RequestInterceptor, !InterceptionPattern>} */
this._urlsForRequestInterceptor = new Platform.Multimap();
- self.SDK.targetManager.observeModels(NetworkManager, this);
+ TargetManager.instance().observeModels(NetworkManager, this);
}
/**
@@ -1334,7 +1334,7 @@
* @return {!Promise<!Array<string>>}
*/
getCertificate(origin) {
- const target = self.SDK.targetManager.mainTarget();
+ const target = TargetManager.instance().mainTarget();
return target.networkAgent().getCertificate(origin).then(certificate => certificate || []);
}
diff --git a/front_end/sdk/OverlayModel.js b/front_end/sdk/OverlayModel.js
index 38a6217..bcf0df8 100644
--- a/front_end/sdk/OverlayModel.js
+++ b/front_end/sdk/OverlayModel.js
@@ -7,7 +7,7 @@
import {DebuggerModel, Events as DebuggerModelEvents} from './DebuggerModel.js';
import {DeferredDOMNode, DOMModel, DOMNode} from './DOMModel.js'; // eslint-disable-line no-unused-vars
import {RemoteObject} from './RemoteObject.js'; // eslint-disable-line no-unused-vars
-import {Capability, SDKModel, Target} from './SDKModel.js'; // eslint-disable-line no-unused-vars
+import {Capability, SDKModel, Target, TargetManager} from './SDKModel.js'; // eslint-disable-line no-unused-vars
/**
* @implements {Protocol.OverlayDispatcher}
@@ -71,17 +71,17 @@
}
static hideDOMNodeHighlight() {
- for (const overlayModel of self.SDK.targetManager.models(OverlayModel)) {
+ for (const overlayModel of TargetManager.instance().models(OverlayModel)) {
overlayModel._delayedHideHighlight(0);
}
}
static async muteHighlight() {
- return Promise.all(self.SDK.targetManager.models(OverlayModel).map(model => model.suspendModel()));
+ return Promise.all(TargetManager.instance().models(OverlayModel).map(model => model.suspendModel()));
}
static async unmuteHighlight() {
- return Promise.all(self.SDK.targetManager.models(OverlayModel).map(model => model.resumeModel()));
+ return Promise.all(TargetManager.instance().models(OverlayModel).map(model => model.resumeModel()));
}
/**
diff --git a/front_end/sdk/ResourceTreeModel.js b/front_end/sdk/ResourceTreeModel.js
index a64c633..618ad00 100644
--- a/front_end/sdk/ResourceTreeModel.js
+++ b/front_end/sdk/ResourceTreeModel.js
@@ -36,7 +36,7 @@
import {NetworkRequest} from './NetworkRequest.js'; // eslint-disable-line no-unused-vars
import {Resource} from './Resource.js';
import {ExecutionContext, RuntimeModel} from './RuntimeModel.js';
-import {Capability, SDKModel, Target} from './SDKModel.js'; // eslint-disable-line no-unused-vars
+import {Capability, SDKModel, Target, TargetManager} from './SDKModel.js'; // eslint-disable-line no-unused-vars
import {SecurityOriginManager} from './SecurityOriginManager.js';
export class ResourceTreeModel extends SDKModel {
@@ -87,7 +87,7 @@
*/
static frames() {
const result = [];
- for (const resourceTreeModel of self.SDK.targetManager.models(ResourceTreeModel)) {
+ for (const resourceTreeModel of TargetManager.instance().models(ResourceTreeModel)) {
result.push(...resourceTreeModel._frames.values());
}
return result;
@@ -98,7 +98,7 @@
* @return {?Resource}
*/
static resourceForURL(url) {
- for (const resourceTreeModel of self.SDK.targetManager.models(ResourceTreeModel)) {
+ for (const resourceTreeModel of TargetManager.instance().models(ResourceTreeModel)) {
const mainFrame = resourceTreeModel.mainFrame;
const result = mainFrame ? mainFrame.resourceForURL(url) : null;
if (result) {
@@ -113,7 +113,7 @@
* @param {string=} scriptToEvaluateOnLoad
*/
static reloadAllPages(bypassCache, scriptToEvaluateOnLoad) {
- for (const resourceTreeModel of self.SDK.targetManager.models(ResourceTreeModel)) {
+ for (const resourceTreeModel of TargetManager.instance().models(ResourceTreeModel)) {
if (!resourceTreeModel.target().parentTarget()) {
resourceTreeModel.reloadPage(bypassCache, scriptToEvaluateOnLoad);
}
diff --git a/front_end/sdk/SDKModel.js b/front_end/sdk/SDKModel.js
index 7e4d0b4..fdab299 100644
--- a/front_end/sdk/SDKModel.js
+++ b/front_end/sdk/SDKModel.js
@@ -346,7 +346,15 @@
Browser: 'browser',
};
+/**
+ * @type {!TargetManager}
+ */
+let targetManagerInstance;
+
export class TargetManager extends Common.ObjectWrapper.ObjectWrapper {
+ /**
+ * @private
+ */
constructor() {
super();
/** @type {!Set.<!Target>} */
@@ -361,6 +369,17 @@
}
/**
+ * @param {{forceNew: boolean}} opts
+ */
+ static instance({forceNew} = {forceNew: false}) {
+ if (!targetManagerInstance || forceNew) {
+ targetManagerInstance = new TargetManager();
+ }
+
+ return targetManagerInstance;
+ }
+
+ /**
* @param {string=} reason - optionally provide a reason, so targets can respond accordingly
* @return {!Promise}
*/
diff --git a/front_end/sdk/ServiceWorkerManager.js b/front_end/sdk/ServiceWorkerManager.js
index 6b7849c..31bc38a 100644
--- a/front_end/sdk/ServiceWorkerManager.js
+++ b/front_end/sdk/ServiceWorkerManager.js
@@ -31,7 +31,7 @@
import * as Common from '../common/common.js';
import {Events as RuntimeModelEvents, ExecutionContext, RuntimeModel} from './RuntimeModel.js'; // eslint-disable-line no-unused-vars
-import {Capability, SDKModel, Target, Type} from './SDKModel.js'; // eslint-disable-line no-unused-vars
+import {Capability, SDKModel, Target, TargetManager, Type} from './SDKModel.js'; // eslint-disable-line no-unused-vars
/**
* @unrestricted
@@ -606,7 +606,7 @@
this._versionByTargetId = new Map();
serviceWorkerManager.addEventListener(Events.RegistrationUpdated, this._registrationsUpdated, this);
serviceWorkerManager.addEventListener(Events.RegistrationDeleted, this._registrationsUpdated, this);
- self.SDK.targetManager.addModelListener(
+ TargetManager.instance().addModelListener(
RuntimeModel, RuntimeModelEvents.ExecutionContextCreated, this._executionContextCreated, this);
}
@@ -650,7 +650,7 @@
}
_updateAllContextLabels() {
- for (const target of self.SDK.targetManager.targets()) {
+ for (const target of TargetManager.instance().targets()) {
const serviceWorkerTargetId = this._serviceWorkerTargetId(target);
if (!serviceWorkerTargetId) {
continue;
diff --git a/front_end/sdk/SourceMapManager.js b/front_end/sdk/SourceMapManager.js
index f9a2369..abe7f28 100644
--- a/front_end/sdk/SourceMapManager.js
+++ b/front_end/sdk/SourceMapManager.js
@@ -4,7 +4,7 @@
import * as Common from '../common/common.js';
-import {Events as TargetManagerEvents, Target} from './SDKModel.js'; // eslint-disable-line no-unused-vars
+import {Events as TargetManagerEvents, Target, TargetManager} from './SDKModel.js'; // eslint-disable-line no-unused-vars
import {SourceMap, TextSourceMap, WasmSourceMap} from './SourceMap.js'; // eslint-disable-line no-unused-vars
/**
@@ -34,7 +34,7 @@
/** @type {!Platform.Multimap<string, !T>} */
this._sourceMapIdToClients = new Platform.Multimap();
- self.SDK.targetManager.addEventListener(TargetManagerEvents.InspectedURLChanged, this._inspectedURLChanged, this);
+ TargetManager.instance().addEventListener(TargetManagerEvents.InspectedURLChanged, this._inspectedURLChanged, this);
}
/**
@@ -247,7 +247,7 @@
for (const sourceMap of this._sourceMapById.values()) {
sourceMap.dispose();
}
- self.SDK.targetManager.removeEventListener(
+ TargetManager.instance().removeEventListener(
TargetManagerEvents.InspectedURLChanged, this._inspectedURLChanged, this);
}
}
diff --git a/front_end/sdk/sdk-legacy.js b/front_end/sdk/sdk-legacy.js
index ed520cc..ed3ff4a 100644
--- a/front_end/sdk/sdk-legacy.js
+++ b/front_end/sdk/sdk-legacy.js
@@ -542,7 +542,7 @@
*/
SDK.multitargetNetworkManager;
-self.SDK.targetManager = new SDKModule.SDKModel.TargetManager();
+self.SDK.targetManager = SDKModule.SDKModel.TargetManager.instance();
self.SDK.isolateManager = new SDKModule.IsolateManager.IsolateManager();
self.SDK.domModelUndoStack = new SDKModule.DOMModel.DOMModelUndoStack();
self.SDK.networkLog = new SDKModule.NetworkLog.NetworkLog();
diff --git a/front_end/security/SecurityPanel.js b/front_end/security/SecurityPanel.js
index b312867..b288c51 100644
--- a/front_end/security/SecurityPanel.js
+++ b/front_end/security/SecurityPanel.js
@@ -37,7 +37,7 @@
/** @type {!Map<!Network.NetworkLogView.MixedContentFilterValues, number>} */
this._filterRequestCounts = new Map();
- self.SDK.targetManager.observeModels(SecurityModel, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(SecurityModel, this);
}
/**
diff --git a/front_end/sources/CoveragePlugin.js b/front_end/sources/CoveragePlugin.js
index de22993..8b18d4d 100644
--- a/front_end/sources/CoveragePlugin.js
+++ b/front_end/sources/CoveragePlugin.js
@@ -4,6 +4,7 @@
import * as Coverage from '../coverage/coverage.js';
import * as Formatter from '../formatter/formatter.js';
+import * as SDK from '../sdk/sdk.js';
import * as SourceFrame from '../source_frame/source_frame.js'; // eslint-disable-line no-unused-vars
import * as UI from '../ui/ui.js';
import * as Workspace from '../workspace/workspace.js'; // eslint-disable-line no-unused-vars
@@ -30,7 +31,7 @@
self.UI.viewManager.showView('coverage');
});
- const mainTarget = self.SDK.targetManager.mainTarget();
+ const mainTarget = SDK.SDKModel.TargetManager.instance().mainTarget();
if (mainTarget) {
this._model = mainTarget.model(Coverage.CoverageModel.CoverageModel);
this._model.addEventListener(Coverage.CoverageModel.Events.CoverageReset, this._handleReset, this);
diff --git a/front_end/sources/DebuggerPlugin.js b/front_end/sources/DebuggerPlugin.js
index a8e53af..e57b2c5 100644
--- a/front_end/sources/DebuggerPlugin.js
+++ b/front_end/sources/DebuggerPlugin.js
@@ -1526,7 +1526,7 @@
}
_updateScriptFiles() {
- for (const debuggerModel of self.SDK.targetManager.models(SDK.DebuggerModel.DebuggerModel)) {
+ for (const debuggerModel of SDK.SDKModel.TargetManager.instance().models(SDK.DebuggerModel.DebuggerModel)) {
const scriptFile = self.Bindings.debuggerWorkspaceBinding.scriptFile(this._uiSourceCode, debuggerModel);
if (scriptFile) {
this._updateScriptFile(debuggerModel);
diff --git a/front_end/sources/JavaScriptCompilerPlugin.js b/front_end/sources/JavaScriptCompilerPlugin.js
index 25354d7..11df2e7 100644
--- a/front_end/sources/JavaScriptCompilerPlugin.js
+++ b/front_end/sources/JavaScriptCompilerPlugin.js
@@ -45,7 +45,7 @@
if (Snippets.ScriptSnippetFileSystem.isSnippetsUISourceCode(uiSourceCode)) {
return true;
}
- for (const debuggerModel of self.SDK.targetManager.models(SDK.DebuggerModel.DebuggerModel)) {
+ for (const debuggerModel of SDK.SDKModel.TargetManager.instance().models(SDK.DebuggerModel.DebuggerModel)) {
if (self.Bindings.debuggerWorkspaceBinding.scriptFile(uiSourceCode, debuggerModel)) {
return true;
}
@@ -68,15 +68,15 @@
* @return {?SDK.RuntimeModel.RuntimeModel}
*/
_findRuntimeModel() {
- const debuggerModels = self.SDK.targetManager.models(SDK.DebuggerModel.DebuggerModel);
+ const debuggerModels = SDK.SDKModel.TargetManager.instance().models(SDK.DebuggerModel.DebuggerModel);
for (let i = 0; i < debuggerModels.length; ++i) {
const scriptFile = self.Bindings.debuggerWorkspaceBinding.scriptFile(this._uiSourceCode, debuggerModels[i]);
if (scriptFile) {
return debuggerModels[i].runtimeModel();
}
}
- return self.SDK.targetManager.mainTarget() ?
- self.SDK.targetManager.mainTarget().model(SDK.RuntimeModel.RuntimeModel) :
+ return SDK.SDKModel.TargetManager.instance().mainTarget() ?
+ SDK.SDKModel.TargetManager.instance().mainTarget().model(SDK.RuntimeModel.RuntimeModel) :
null;
}
diff --git a/front_end/sources/NavigatorView.js b/front_end/sources/NavigatorView.js
index 7b65490..4cb6e5f 100644
--- a/front_end/sources/NavigatorView.js
+++ b/front_end/sources/NavigatorView.js
@@ -81,9 +81,10 @@
Persistence.Persistence.Events.BindingCreated, this._onBindingChanged, this);
self.Persistence.persistence.addEventListener(
Persistence.Persistence.Events.BindingRemoved, this._onBindingChanged, this);
- self.SDK.targetManager.addEventListener(SDK.SDKModel.Events.NameChanged, this._targetNameChanged, this);
+ SDK.SDKModel.TargetManager.instance().addEventListener(
+ SDK.SDKModel.Events.NameChanged, this._targetNameChanged, this);
- self.SDK.targetManager.observeTargets(this);
+ SDK.SDKModel.TargetManager.instance().observeTargets(this);
this._resetWorkspace(self.Workspace.workspace);
this._workspace.uiSourceCodes().forEach(this._addUISourceCode.bind(this));
self.Bindings.networkProjectManager.addEventListener(
@@ -597,7 +598,7 @@
* @return {!NavigatorTreeNode}
*/
_targetNode(project, target) {
- if (target === self.SDK.targetManager.mainTarget()) {
+ if (target === SDK.SDKModel.TargetManager.instance().mainTarget()) {
return this._rootNode;
}
diff --git a/front_end/sources/SourcesNavigator.js b/front_end/sources/SourcesNavigator.js
index 2fad34a..882ada3 100644
--- a/front_end/sources/SourcesNavigator.js
+++ b/front_end/sources/SourcesNavigator.js
@@ -44,7 +44,8 @@
export class NetworkNavigatorView extends NavigatorView {
constructor() {
super();
- self.SDK.targetManager.addEventListener(SDK.SDKModel.Events.InspectedURLChanged, this._inspectedURLChanged, this);
+ SDK.SDKModel.TargetManager.instance().addEventListener(
+ SDK.SDKModel.Events.InspectedURLChanged, this._inspectedURLChanged, this);
// Record the sources tool load time after the file navigator has loaded.
Host.userMetrics.panelLoaded('sources', 'DevTools.Launch.Sources');
@@ -63,7 +64,7 @@
* @param {!Common.EventTarget.EventTargetEvent} event
*/
_inspectedURLChanged(event) {
- const mainTarget = self.SDK.targetManager.mainTarget();
+ const mainTarget = SDK.SDKModel.TargetManager.instance().mainTarget();
if (event.data !== mainTarget) {
return;
}
@@ -83,7 +84,7 @@
* @param {!Workspace.UISourceCode.UISourceCode} uiSourceCode
*/
uiSourceCodeAdded(uiSourceCode) {
- const mainTarget = self.SDK.targetManager.mainTarget();
+ const mainTarget = SDK.SDKModel.TargetManager.instance().mainTarget();
const inspectedURL = mainTarget && mainTarget.inspectedURL();
if (!inspectedURL) {
return;
diff --git a/front_end/sources/SourcesPanel.js b/front_end/sources/SourcesPanel.js
index 2cc4d1c..5d51037 100644
--- a/front_end/sources/SourcesPanel.js
+++ b/front_end/sources/SourcesPanel.js
@@ -137,19 +137,19 @@
.addChangeListener(this._breakpointsActiveStateChanged, this);
self.UI.context.addFlavorChangeListener(SDK.SDKModel.Target, this._onCurrentTargetChanged, this);
self.UI.context.addFlavorChangeListener(SDK.DebuggerModel.CallFrame, this._callFrameChanged, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DebuggerModel.DebuggerModel, SDK.DebuggerModel.Events.DebuggerWasEnabled, this._debuggerWasEnabled, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DebuggerModel.DebuggerModel, SDK.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this);
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DebuggerModel.DebuggerModel, SDK.DebuggerModel.Events.DebuggerResumed,
event => this._debuggerResumed(/** @type {!SDK.DebuggerModel.DebuggerModel} */ (event.data)));
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.DebuggerModel.DebuggerModel, SDK.DebuggerModel.Events.GlobalObjectCleared,
event => this._debuggerResumed(/** @type {!SDK.DebuggerModel.DebuggerModel} */ (event.data)));
self.Extensions.extensionServer.addEventListener(
Extensions.ExtensionServer.Events.SidebarPaneAdded, this._extensionSidebarPaneAdded, this);
- self.SDK.targetManager.observeTargets(this);
+ SDK.SDKModel.TargetManager.instance().observeTargets(this);
}
/**
@@ -560,7 +560,7 @@
return;
}
- for (const debuggerModel of self.SDK.targetManager.models(SDK.DebuggerModel.DebuggerModel)) {
+ for (const debuggerModel of SDK.SDKModel.TargetManager.instance().models(SDK.DebuggerModel.DebuggerModel)) {
if (debuggerModel.isPaused()) {
self.UI.context.setFlavor(SDK.SDKModel.Target, debuggerModel.target());
break;
diff --git a/front_end/sources/ThreadsSidebarPane.js b/front_end/sources/ThreadsSidebarPane.js
index 93f0729..228033d 100644
--- a/front_end/sources/ThreadsSidebarPane.js
+++ b/front_end/sources/ThreadsSidebarPane.js
@@ -24,14 +24,14 @@
this.contentElement.appendChild(this._list.element);
self.UI.context.addFlavorChangeListener(SDK.SDKModel.Target, this._targetFlavorChanged, this);
- self.SDK.targetManager.observeModels(SDK.DebuggerModel.DebuggerModel, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.DebuggerModel.DebuggerModel, this);
}
/**
* @return {boolean}
*/
static shouldBeShown() {
- return self.SDK.targetManager.models(SDK.DebuggerModel.DebuggerModel).length >= 2;
+ return SDK.SDKModel.TargetManager.instance().models(SDK.DebuggerModel.DebuggerModel).length >= 2;
}
/**
@@ -76,7 +76,7 @@
debuggerModel.addEventListener(SDK.DebuggerModel.Events.DebuggerPaused, updatePausedState);
debuggerModel.addEventListener(SDK.DebuggerModel.Events.DebuggerResumed, updatePausedState);
debuggerModel.runtimeModel().addEventListener(SDK.RuntimeModel.Events.ExecutionContextChanged, updateTitle);
- self.SDK.targetManager.addEventListener(SDK.SDKModel.Events.NameChanged, targetNameChanged);
+ SDK.SDKModel.TargetManager.instance().addEventListener(SDK.SDKModel.Events.NameChanged, targetNameChanged);
updatePausedState();
updateTitle();
diff --git a/front_end/test_runner/test_runner.js b/front_end/test_runner/test_runner.js
index b6bcd1d..185d7f6 100644
--- a/front_end/test_runner/test_runner.js
+++ b/front_end/test_runner/test_runner.js
@@ -108,4 +108,4 @@
}
}
-self.SDK.targetManager.observeTargets(new _TestObserver());
+SDK.targetManager.observeTargets(new _TestObserver());
diff --git a/front_end/timeline/TimelineController.js b/front_end/timeline/TimelineController.js
index 5fbe8ec..5d1b791 100644
--- a/front_end/timeline/TimelineController.js
+++ b/front_end/timeline/TimelineController.js
@@ -35,11 +35,11 @@
/** @type {!Array<!ExtensionTracingSession>} */
this._extensionSessions = [];
- self.SDK.targetManager.observeModels(SDK.CPUProfilerModel.CPUProfilerModel, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(SDK.CPUProfilerModel.CPUProfilerModel, this);
}
dispose() {
- self.SDK.targetManager.unobserveModels(SDK.CPUProfilerModel.CPUProfilerModel, this);
+ SDK.SDKModel.TargetManager.instance().unobserveModels(SDK.CPUProfilerModel.CPUProfilerModel, this);
}
/**
@@ -165,7 +165,7 @@
*/
_startProfilingOnAllModels() {
this._profiling = true;
- const models = self.SDK.targetManager.models(SDK.CPUProfilerModel.CPUProfilerModel);
+ const models = SDK.SDKModel.TargetManager.instance().models(SDK.CPUProfilerModel.CPUProfilerModel);
return Promise.all(models.map(model => model.startRecording()));
}
@@ -188,7 +188,8 @@
* @return {!Promise}
*/
_stopProfilingOnAllModels() {
- const models = this._profiling ? self.SDK.targetManager.models(SDK.CPUProfilerModel.CPUProfilerModel) : [];
+ const models =
+ this._profiling ? SDK.SDKModel.TargetManager.instance().models(SDK.CPUProfilerModel.CPUProfilerModel) : [];
this._profiling = false;
const promises = [];
for (const model of models) {
@@ -208,7 +209,7 @@
// There might be a significant delay in the beginning of timeline recording
// caused by starting CPU profiler, that needs to traverse JS heap to collect
// all the functions data.
- await self.SDK.targetManager.suspendAllTargets('performance-timeline');
+ await SDK.SDKModel.TargetManager.instance().suspendAllTargets('performance-timeline');
if (enableJSSampling && Root.Runtime.queryParam('timelineTracingJSProfileDisabled')) {
await this._startProfilingOnAllModels();
}
@@ -247,7 +248,7 @@
*/
async _finalizeTrace() {
this._injectCpuProfileEvents();
- await self.SDK.targetManager.resumeAllTargets();
+ await SDK.SDKModel.TargetManager.instance().resumeAllTargets();
this._tracingModel.tracingComplete();
this._client.loadingComplete(this._tracingModel);
}
@@ -313,7 +314,7 @@
const mainRendererProcessId = mainFrame.processId;
const mainProcess = this._tracingModel.processById(mainRendererProcessId);
if (mainProcess) {
- targetIdToPid.set(self.SDK.targetManager.mainTarget().id(), mainProcess.id());
+ targetIdToPid.set(SDK.SDKModel.TargetManager.instance().mainTarget().id(), mainProcess.id());
}
return targetIdToPid;
}
@@ -353,7 +354,7 @@
// of cpu profiles.
let tid = 0;
for (const pair of this._cpuProfiles) {
- const target = self.SDK.targetManager.targetById(pair[0]);
+ const target = SDK.SDKModel.TargetManager.instance().targetById(pair[0]);
const name = target && target.name();
this._tracingModel.addEvents(
TimelineModel.TimelineJSProfile.TimelineJSProfileProcessor.buildTraceProfileFromCpuProfile(
diff --git a/front_end/timeline/TimelineDetailsView.js b/front_end/timeline/TimelineDetailsView.js
index 764e291..173ae5c 100644
--- a/front_end/timeline/TimelineDetailsView.js
+++ b/front_end/timeline/TimelineDetailsView.js
@@ -254,7 +254,7 @@
* @param {!SDK.TracingModel.Event} event
*/
_showEventInPaintProfiler(event) {
- const paintProfilerModel = self.SDK.targetManager.models(SDK.PaintProfiler.PaintProfilerModel)[0];
+ const paintProfilerModel = SDK.SDKModel.TargetManager.instance().models(SDK.PaintProfiler.PaintProfilerModel)[0];
if (!paintProfilerModel) {
return;
}
diff --git a/front_end/timeline/TimelinePanel.js b/front_end/timeline/TimelinePanel.js
index 2fa0877..41a94e1 100644
--- a/front_end/timeline/TimelinePanel.js
+++ b/front_end/timeline/TimelinePanel.js
@@ -127,7 +127,7 @@
this._createFileSelector();
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.Load, this._loadEventFired, this);
this._flameChart = new TimelineFlameChartView(this);
@@ -146,7 +146,8 @@
self.Extensions.extensionServer.addEventListener(
Extensions.ExtensionServer.Events.TraceProviderAdded, this._appendExtensionsToToolbar, this);
- self.SDK.targetManager.addEventListener(SDK.SDKModel.Events.SuspendStateChanged, this._onSuspendStateChanged, this);
+ SDK.SDKModel.TargetManager.instance().addEventListener(
+ SDK.SDKModel.Events.SuspendStateChanged, this._onSuspendStateChanged, this);
}
/**
@@ -557,7 +558,7 @@
const enabledTraceProviders = self.Extensions.extensionServer.traceProviders().filter(
provider => TimelinePanel._settingForTraceProvider(provider).get());
- const mainTarget = /** @type {!SDK.SDKModel.Target} */ (self.SDK.targetManager.mainTarget());
+ const mainTarget = /** @type {!SDK.SDKModel.Target} */ (SDK.SDKModel.TargetManager.instance().mainTarget());
if (UIDevtoolsUtils.isUiDevTools()) {
this._controller = new UIDevtoolsController(mainTarget, this);
} else {
diff --git a/front_end/timeline/TimelineTreeView.js b/front_end/timeline/TimelineTreeView.js
index 23466470..dc2a99d 100644
--- a/front_end/timeline/TimelineTreeView.js
+++ b/front_end/timeline/TimelineTreeView.js
@@ -718,7 +718,7 @@
_updateExtensionResolver() {
this._executionContextNamesByOrigin = new Map();
- for (const runtimeModel of self.SDK.targetManager.models(SDK.RuntimeModel.RuntimeModel)) {
+ for (const runtimeModel of SDK.SDKModel.TargetManager.instance().models(SDK.RuntimeModel.RuntimeModel)) {
for (const context of runtimeModel.executionContexts()) {
this._executionContextNamesByOrigin.set(context.origin, context.name);
}
diff --git a/front_end/timeline_model/TimelineModel.js b/front_end/timeline_model/TimelineModel.js
index 1fa125f..d0801bb 100644
--- a/front_end/timeline_model/TimelineModel.js
+++ b/front_end/timeline_model/TimelineModel.js
@@ -173,8 +173,8 @@
targetByEvent(event) {
// FIXME: Consider returning null for loaded traces.
const workerId = this._workerIdByThread.get(event.thread);
- const mainTarget = self.SDK.targetManager.mainTarget();
- return workerId ? self.SDK.targetManager.targetById(workerId) : mainTarget;
+ const mainTarget = SDK.SDKModel.TargetManager.instance().mainTarget();
+ return workerId ? SDK.SDKModel.TargetManager.instance().targetById(workerId) : mainTarget;
}
/**
diff --git a/front_end/web_audio/WebAudioModel.js b/front_end/web_audio/WebAudioModel.js
index f050214..38bf60f 100644
--- a/front_end/web_audio/WebAudioModel.js
+++ b/front_end/web_audio/WebAudioModel.js
@@ -27,7 +27,7 @@
// To resolve this inconsistency, we flush the leftover from the previous
// frame when the current page is loaded. This call can be omitted when the
// bug is fixed.
- self.SDK.targetManager.addModelListener(
+ SDK.SDKModel.TargetManager.instance().addModelListener(
SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.FrameNavigated, this._flushContexts,
this);
}
diff --git a/front_end/web_audio/WebAudioView.js b/front_end/web_audio/WebAudioView.js
index aee109f..aa3fe8f 100644
--- a/front_end/web_audio/WebAudioView.js
+++ b/front_end/web_audio/WebAudioView.js
@@ -56,7 +56,7 @@
this.doUpdate();
});
- self.SDK.targetManager.observeModels(WebAudioModel, this);
+ SDK.SDKModel.TargetManager.instance().observeModels(WebAudioModel, this);
}
/**
@@ -64,7 +64,7 @@
*/
wasShown() {
super.wasShown();
- for (const model of self.SDK.targetManager.models(WebAudioModel)) {
+ for (const model of SDK.SDKModel.TargetManager.instance().models(WebAudioModel)) {
this._addEventListeners(model);
}
}
@@ -73,7 +73,7 @@
* @override
*/
willHide() {
- for (const model of self.SDK.targetManager.models(WebAudioModel)) {
+ for (const model of SDK.SDKModel.TargetManager.instance().models(WebAudioModel)) {
this._removeEventListeners(model);
}
}
@@ -392,7 +392,7 @@
return;
}
- for (const model of self.SDK.targetManager.models(WebAudio.WebAudioModel)) {
+ for (const model of SDK.SDKModel.TargetManager.instance().models(WebAudio.WebAudioModel)) {
// Display summary only for real-time context.
if (context.contextType === 'realtime') {
if (!this._graphManager.hasContext(context.contextId)) {
diff --git a/front_end/worker_main/WorkerMain.js b/front_end/worker_main/WorkerMain.js
index 404653a..4a02a57 100644
--- a/front_end/worker_main/WorkerMain.js
+++ b/front_end/worker_main/WorkerMain.js
@@ -16,7 +16,7 @@
*/
run() {
SDK.Connections.initMainConnection(() => {
- self.SDK.targetManager.createTarget('main', ls`Main`, SDK.SDKModel.Type.ServiceWorker, null);
+ SDK.SDKModel.TargetManager.instance().createTarget('main', ls`Main`, SDK.SDKModel.Type.ServiceWorker, null);
}, Components.TargetDetachedDialog.TargetDetachedDialog.webSocketConnectionLost);
new MobileThrottling.NetworkPanelIndicator.NetworkPanelIndicator();
}
