Remove typedefs from {resources,sdk,search,security}-legacy.js
Bug: 1006759
Change-Id: I1d04169013b54a4b78e9dfd1fa77ad97e49ca870
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2060006
Reviewed-by: Paul Lewis <[email protected]>
Commit-Queue: Tim van der Lippe <[email protected]>
diff --git a/front_end/resources/BackgroundServiceView.js b/front_end/resources/BackgroundServiceView.js
index ad6d7fa..9401c40 100644
--- a/front_end/resources/BackgroundServiceView.js
+++ b/front_end/resources/BackgroundServiceView.js
@@ -168,7 +168,7 @@
* @param {!Common.EventTarget.EventTargetEvent} event
*/
_onRecordingStateChanged(event) {
- const state = /** @type {!Resources.BackgroundServiceModel.RecordingState} */ (event.data);
+ const state = /** @type {!RecordingState} */ (event.data);
if (state.serviceName !== this._serviceName) {
return;
}
@@ -238,7 +238,7 @@
/**
* Creates the data object to pass to the DataGrid Node.
* @param {!Protocol.BackgroundService.BackgroundServiceEvent} serviceEvent
- * @return {!Resources.BackgroundServiceView.EventData}
+ * @return {!EventData}
*/
_createEventData(serviceEvent) {
let swScope = '';
@@ -437,3 +437,20 @@
return false;
}
}
+
+/**
+ * @typedef {!{isRecording: boolean, serviceName: !Protocol.BackgroundService.ServiceName}}
+ */
+export let RecordingState;
+
+/**
+ * @typedef {{
+ * id: number,
+ * timestamp: string,
+ * origin: string,
+ * swScope: string,
+ * eventName: string,
+ * instanceId: string,
+ * }}
+ */
+export let EventData;
diff --git a/front_end/resources/IndexedDBModel.js b/front_end/resources/IndexedDBModel.js
index ff697d9..27e5f4f 100644
--- a/front_end/resources/IndexedDBModel.js
+++ b/front_end/resources/IndexedDBModel.js
@@ -450,7 +450,7 @@
/**
* @param {!DatabaseId} databaseId
* @param {!ObjectStore} objectStore
- * @return {!Promise<?Resources.IndexedDBModel.ObjectStoreMetadata>}
+ * @return {!Promise<?ObjectStoreMetadata>}
*/
async getMetadata(databaseId, objectStore) {
const databaseOrigin = databaseId.securityOrigin;
@@ -644,3 +644,11 @@
return /** @type {string}*/ (IndexedDBModel.keyPathStringFromIDBKeyPath(/** @type {string}*/ (this.keyPath)));
}
}
+
+/**
+ * @typedef {{
+ * entriesCount: number,
+ * keyGeneratorValue: number
+ * }}
+ */
+export let ObjectStoreMetadata;
diff --git a/front_end/resources/IndexedDBViews.js b/front_end/resources/IndexedDBViews.js
index 0cc2ee2..3fc364a 100644
--- a/front_end/resources/IndexedDBViews.js
+++ b/front_end/resources/IndexedDBViews.js
@@ -34,7 +34,7 @@
import * as SDK from '../sdk/sdk.js'; // eslint-disable-line no-unused-vars
import * as UI from '../ui/ui.js';
-import {Database, DatabaseId, Entry, Index, IndexedDBModel, ObjectStore} from './IndexedDBModel.js'; // eslint-disable-line no-unused-vars
+import {Database, DatabaseId, Entry, Index, IndexedDBModel, ObjectStore, ObjectStoreMetadata} from './IndexedDBModel.js'; // eslint-disable-line no-unused-vars
/**
* @unrestricted
@@ -398,7 +398,7 @@
}
/**
- * @param {?Resources.IndexedDBModel.ObjectStoreMetadata} metadata
+ * @param {?ObjectStoreMetadata} metadata
*/
_updateSummaryBar(metadata) {
if (!this._summaryBarElement) {
diff --git a/front_end/resources/resources-legacy.js b/front_end/resources/resources-legacy.js
index 45b7bee..11aedf9 100644
--- a/front_end/resources/resources-legacy.js
+++ b/front_end/resources/resources-legacy.js
@@ -101,28 +101,3 @@
/** @constructor */
Resources.ServiceWorkersView = ResourcesModule.ServiceWorkersView.ServiceWorkersView;
-
-/**
- * @typedef {!{isRecording: boolean, serviceName: !Protocol.BackgroundService.ServiceName}}
- */
-Resources.BackgroundServiceModel.RecordingState;
-
-/**
- * @typedef {{
- * id: number,
- * timestamp: string,
- * origin: string,
- * swScope: string,
- * eventName: string,
- * instanceId: string,
- * }}
- */
-Resources.BackgroundServiceView.EventData;
-
-/**
- * @typedef {{
- * entriesCount: number,
- * keyGeneratorValue: number
- * }}
- */
-Resources.IndexedDBModel.ObjectStoreMetadata;
diff --git a/front_end/sdk/CPUProfilerModel.js b/front_end/sdk/CPUProfilerModel.js
index 3565140..2c3ef2b 100644
--- a/front_end/sdk/CPUProfilerModel.js
+++ b/front_end/sdk/CPUProfilerModel.js
@@ -110,7 +110,7 @@
_dispatchProfileEvent(eventName, id, scriptLocation, title, cpuProfile) {
const debuggerLocation = Location.fromPayload(this._debuggerModel, scriptLocation);
const globalId = this.target().id() + '.' + id;
- const data = /** @type {!SDK.CPUProfilerModel.EventData} */ (
+ const data = /** @type {!EventData} */ (
{id: globalId, scriptLocation: debuggerLocation, cpuProfile: cpuProfile, title: title, cpuProfilerModel: this});
this.dispatchEventToListeners(eventName, data);
}
diff --git a/front_end/sdk/CSSMetadata.js b/front_end/sdk/CSSMetadata.js
index 57db73d..c809572 100644
--- a/front_end/sdk/CSSMetadata.js
+++ b/front_end/sdk/CSSMetadata.js
@@ -39,7 +39,7 @@
*/
export class CSSMetadata {
/**
- * @param {!Array.<!SDK.CSSMetadata.CSSPropertyDefinition>} properties
+ * @param {!Array.<!CSSPropertyDefinition>} properties
*/
constructor(properties) {
this._values = /** !Array.<string> */ ([]);
@@ -1153,3 +1153,8 @@
// Common keywords to CSS properties
const CommonKeywords = ['auto', 'none'];
+
+/**
+ * @typedef {{name: string, longhands: !Array.<string>, inherited: boolean, svg: boolean}}
+ */
+export let CSSPropertyDefinition;
diff --git a/front_end/sdk/ConsoleModel.js b/front_end/sdk/ConsoleModel.js
index 128ef25..3455b5d 100644
--- a/front_end/sdk/ConsoleModel.js
+++ b/front_end/sdk/ConsoleModel.js
@@ -31,7 +31,7 @@
import * as Common from '../common/common.js';
import * as HostModule from '../host/host.js';
-import {CPUProfilerModel, Events as CPUProfilerModelEvents} from './CPUProfilerModel.js';
+import {CPUProfilerModel, EventData, Events as CPUProfilerModelEvents} from './CPUProfilerModel.js'; // eslint-disable-line no-unused-vars
import {Events as DebuggerModelEvents, Location} from './DebuggerModel.js'; // eslint-disable-line no-unused-vars
import {LogModel} from './LogModel.js';
import {RemoteObject} from './RemoteObject.js';
@@ -287,7 +287,7 @@
* @param {!Common.EventTarget.EventTargetEvent} event
*/
_consoleProfileStarted(cpuProfilerModel, event) {
- const data = /** @type {!SDK.CPUProfilerModel.EventData} */ (event.data);
+ const data = /** @type {!EventData} */ (event.data);
this._addConsoleProfileMessage(
cpuProfilerModel, MessageType.Profile, data.scriptLocation,
Common.UIString.UIString('Profile \'%s\' started.', data.title));
@@ -298,7 +298,7 @@
* @param {!Common.EventTarget.EventTargetEvent} event
*/
_consoleProfileFinished(cpuProfilerModel, event) {
- const data = /** @type {!SDK.CPUProfilerModel.EventData} */ (event.data);
+ const data = /** @type {!EventData} */ (event.data);
this._addConsoleProfileMessage(
cpuProfilerModel, MessageType.ProfileEnd, data.scriptLocation,
Common.UIString.UIString('Profile \'%s\' finished.', data.title));
diff --git a/front_end/sdk/sdk-legacy.js b/front_end/sdk/sdk-legacy.js
index 4ac878d..ed520cc 100644
--- a/front_end/sdk/sdk-legacy.js
+++ b/front_end/sdk/sdk-legacy.js
@@ -159,9 +159,6 @@
/** @constructor */
SDK.DOMDebuggerModel.DOMBreakpoint = SDKModule.DOMDebuggerModel.DOMBreakpoint;
-/** @typedef {Protocol.DOMDebugger.DOMBreakpointType} */
-SDK.DOMDebuggerModel.DOMBreakpoint.Type = Protocol.DOMDebugger.DOMBreakpointType;
-
/** @constructor */
SDK.DOMDebuggerModel.EventListenerBreakpoint = SDKModule.DOMDebuggerModel.EventListenerBreakpoint;
@@ -529,14 +526,6 @@
/** @interface */
SDK.BackingStorage = SDKModule.TracingModel.BackingStorage;
-/** @typedef {!{id: string, scriptLocation: !SDK.DebuggerModel.Location, title: string, cpuProfile: (!Protocol.Profiler.Profile|undefined), cpuProfilerModel: !SDK.CPUProfilerModel}} */
-SDK.CPUProfilerModel.EventData;
-
-/**
- * @typedef {{name: string, longhands: !Array.<string>, inherited: boolean, svg: boolean}}
- */
-SDK.CSSMetadata.CSSPropertyDefinition;
-
/** @type {function({target: !SDK.Target, waitingForDebugger: boolean})|undefined} */
SDK.ChildTargetManager._attachCallback;
diff --git a/front_end/search/SearchConfig.js b/front_end/search/SearchConfig.js
index aa87969..f31d2eb 100644
--- a/front_end/search/SearchConfig.js
+++ b/front_end/search/SearchConfig.js
@@ -93,7 +93,7 @@
const fileQuery = this._parseFileQuery(queryPart);
if (fileQuery) {
this._fileQueries.push(fileQuery);
- /** @type {!Array.<!Search.SearchConfig.RegexQuery>} */
+ /** @type {!Array.<!RegexQuery>} */
this._fileRegexQueries = this._fileRegexQueries || [];
this._fileRegexQueries.push(
{regex: new RegExp(fileQuery.text, this.ignoreCase ? 'i' : ''), isNegative: fileQuery.isNegative});
@@ -258,3 +258,6 @@
stopSearch() {}
}
+
+/** @typedef {!{regex: !RegExp, isNegative: boolean}} */
+export let RegexQuery;
diff --git a/front_end/search/search-legacy.js b/front_end/search/search-legacy.js
index 24e633e..18cd540 100644
--- a/front_end/search/search-legacy.js
+++ b/front_end/search/search-legacy.js
@@ -31,6 +31,3 @@
* @constructor
*/
Search.SearchView = SearchModule.SearchView.SearchView;
-
-/** @typedef {!{regex: !RegExp, isNegative: boolean}} */
-Search.SearchConfig.RegexQuery;
diff --git a/front_end/security/SecurityPanel.js b/front_end/security/SecurityPanel.js
index 0953b4e..b312867 100644
--- a/front_end/security/SecurityPanel.js
+++ b/front_end/security/SecurityPanel.js
@@ -31,7 +31,7 @@
/** @type {!Map<!Protocol.Network.LoaderId, !SDK.NetworkRequest.NetworkRequest>} */
this._lastResponseReceivedForLoaderId = new Map();
- /** @type {!Map<!Security.SecurityPanel.Origin, !Security.SecurityPanel.OriginState>} */
+ /** @type {!Map<!Origin, !OriginState>} */
this._origins = new Map();
/** @type {!Map<!Network.NetworkLogView.MixedContentFilterValues, number>} */
@@ -148,7 +148,7 @@
this._sidebarMainViewElement.select(true);
}
/**
- * @param {!Security.SecurityPanel.Origin} origin
+ * @param {!Origin} origin
*/
showOrigin(origin) {
const originState = this._origins.get(origin);
@@ -400,7 +400,7 @@
export class SecurityPanelSidebarTree extends UI.TreeOutline.TreeOutlineInShadow {
/**
* @param {!SecurityPanelSidebarTreeElement} mainViewElement
- * @param {function(!Security.SecurityPanel.Origin)} showOriginInPanel
+ * @param {function(!Origin)} showOriginInPanel
*/
constructor(mainViewElement, showOriginInPanel) {
super();
@@ -437,7 +437,7 @@
mainViewReloadMessage.listItemElement.classList.add('security-main-view-reload-message');
this._originGroups.get(OriginGroup.MainOrigin).appendChild(mainViewReloadMessage);
- /** @type {!Map<!Security.SecurityPanel.Origin, !SecurityPanelSidebarTreeElement>} */
+ /** @type {!Map<!Origin, !SecurityPanelSidebarTreeElement>} */
this._elementsByOrigin = new Map();
}
@@ -465,7 +465,7 @@
}
/**
- * @param {!Security.SecurityPanel.Origin} origin
+ * @param {!Origin} origin
* @param {!Protocol.Security.SecurityState} securityState
*/
addOrigin(origin, securityState) {
@@ -478,14 +478,14 @@
}
/**
- * @param {!Security.SecurityPanel.Origin} origin
+ * @param {!Origin} origin
*/
setMainOrigin(origin) {
this._mainOrigin = origin;
}
/**
- * @param {!Security.SecurityPanel.Origin} origin
+ * @param {!Origin} origin
* @param {!Protocol.Security.SecurityState} securityState
*/
updateOrigin(origin, securityState) {
@@ -1127,8 +1127,8 @@
export class SecurityOriginView extends UI.Widget.VBox {
/**
* @param {!SecurityPanel} panel
- * @param {!Security.SecurityPanel.Origin} origin
- * @param {!Security.SecurityPanel.OriginState} originState
+ * @param {!Origin} origin
+ * @param {!OriginState} originState
*/
constructor(panel, origin, originState) {
super();
@@ -1404,3 +1404,16 @@
}
}
}
+
+/**
+ * @typedef {{
+ * securityState: !Protocol.Security.SecurityState,
+ * securityDetails: ?Protocol.Network.SecurityDetails,
+ * loadedFromCache: boolean,
+ * originView: (?SecurityOriginView|undefined),
+ * }}
+ */
+export let OriginState;
+
+/** @typedef {string} */
+export let Origin;
diff --git a/front_end/security/security-legacy.js b/front_end/security/security-legacy.js
index 4d77a28..3f4a2ca9 100644
--- a/front_end/security/security-legacy.js
+++ b/front_end/security/security-legacy.js
@@ -52,15 +52,3 @@
* @constructor
*/
Security.SecurityOriginView = SecurityModule.SecurityPanel.SecurityOriginView;
-
-/** @typedef {string} */
-Security.SecurityPanel.Origin;
-
-/**
- * @typedef {Object}
- * @property {!Protocol.Security.SecurityState} securityState
- * @property {?Protocol.Network.SecurityDetails} securityDetails
- * @property {?bool} loadedFromCache
- * @property {?Security.SecurityOriginView} originView
- */
-Security.SecurityPanel.OriginState;
