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;
