🏷️ Fix types for nsIChannel, nsIRequest and nsIWebProgress

dothq · Dec 16, 2023 · 1b0996d · 1b0996d
1 parent c7cca98
commit 1b0996d
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 11 deletions.
diff --git a/base/content/browser-window.js b/base/content/browser-window.js
@@ -137,8 +137,8 @@ class nsIXULBrowserWindow {
 
 	/**
 	 * Fired when the state of the browser changes
-	 * @param {nsIWebProgress} webProgress
-	 * @param {nsIRequest} request
+	 * @param {import("third_party/dothq/gecko-types/lib").nsIWebProgress} webProgress
+	 * @param {import("third_party/dothq/gecko-types/lib").nsIRequest} request
 	 * @param {number} stateFlags
 	 * @param {number} status
 	 */
@@ -178,8 +178,8 @@ class nsIXULBrowserWindow {
 
 	/**
 	 * Fired when the status of the browser changes
-	 * @param {nsIWebProgress} webProgress
-	 * @param {nsIRequest} request
+	 * @param {import("third_party/dothq/gecko-types/lib").nsIWebProgress} webProgress
+	 * @param {import("third_party/dothq/gecko-types/lib").nsIRequest} request
 	 * @param {number} status
 	 * @param {string} message
 	 */

diff --git a/components/commands/TabCommand.sys.mjs b/components/commands/TabCommand.sys.mjs
@@ -29,8 +29,8 @@ export class TabCommand extends Command {
 	 * Fired when the state changes the browser in context
 	 * @param {object} data
 	 * @param {ChromeBrowser} data.browser
-	 * @param {nsIWebProgress} data.webProgress
-	 * @param {nsIRequest} data.request
+	 * @param {import("third_party/dothq/gecko-types/lib").nsIWebProgress} data.webProgress
+	 * @param {import("third_party/dothq/gecko-types/lib").nsIRequest} data.request
 	 * @param {number} data.stateFlags
 	 * @param {string} data.status
 	 */

diff --git a/components/commands/content/reload-tab.js b/components/commands/content/reload-tab.js
@@ -49,8 +49,8 @@ export class ReloadTabCommand extends TabCommand {
 	 * Fired when the state changes a browser
 	 * @param {object} data
 	 * @param {ChromeBrowser} data.browser
-	 * @param {nsIWebProgress} data.webProgress
-	 * @param {nsIRequest} data.request
+	 * @param {import("third_party/dothq/gecko-types/lib").nsIWebProgress} data.webProgress
+	 * @param {import("third_party/dothq/gecko-types/lib").nsIRequest} data.request
 	 * @param {number} data.stateFlags
 	 * @param {string} data.status
 	 */
@@ -67,7 +67,9 @@ export class ReloadTabCommand extends TabCommand {
 			Ci.nsIWebProgressListener;
 
 		const shouldShowProgress = BrowserTabsUtils.shouldShowProgress(
-			/** @type {nsIChannel} */ (request)
+			/** @type {import("third_party/dothq/gecko-types/lib").nsIChannel} */ (
+				request
+			)
 		);
 
 		this.isLoading =

diff --git a/components/identity/TabIdentityHandler.sys.mjs b/components/identity/TabIdentityHandler.sys.mjs
@@ -116,8 +116,8 @@ export class TabIdentityHandler {
 	 * Handles Gecko security change events from the browser
 	 * @param {object} data
 	 * @param {ChromeBrowser} data.browser
-	 * @param {nsIWebProgress} data.webProgress
-	 * @param {nsIRequest} data.request
+	 * @param {import("third_party/dothq/gecko-types/lib").nsIWebProgress} data.webProgress
+	 * @param {import("third_party/dothq/gecko-types/lib").nsIRequest} data.request
 	 * @param {number} data.state
 	 */
 	onSecurityChange({ browser, webProgress, request, state }) {

diff --git a/third_party/dothq/gecko-types/lib/NetUtil.d.ts b/third_party/dothq/gecko-types/lib/NetUtil.d.ts
@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+import { nsIChannel } from ".";
+
 export interface NetUtil {
     newURI(target: any, originCharset?: string, baseURI?: nsIURI): nsIURI;
     newChannel(whatToLoad: object): nsIChannel;

diff --git a/third_party/dothq/gecko-types/lib/nsIAboutModule.d.ts b/third_party/dothq/gecko-types/lib/nsIAboutModule.d.ts
@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+import { nsIChannel } from ".";
+
 export interface nsIAboutModule extends nsIChannel {
 	/**
 	 * Constructs a new channel for the about protocol module.

diff --git a/third_party/dothq/gecko-types/lib/services/prompt.d.ts b/third_party/dothq/gecko-types/lib/services/prompt.d.ts
@@ -4,6 +4,7 @@
 
 import { BrowsingContext } from "../BrowsingContext";
 import { nsIAuthInformation } from "../nsIAuthInformation";
+import { nsIChannel } from "../nsIChannel";
 
 export interface ServicesPrompt {
 	/**