Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 6 deletions

diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
index a2a5f6ff71..60bd4fc01c 100644
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -456,7 +456,9 @@ var gIdentityHandler = {
     );
 
     // Reload the page with the content unblocked
-    BrowserReloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE);
+    BrowserCommands.reloadWithFlags(
+      Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE
+    );
     if (this._popupInitialized) {
       PanelMultiView.hidePopup(this._identityPopup);
     }
@@ -475,7 +477,7 @@ var gIdentityHandler = {
       "mixed-content"
     );
     if (reload) {
-      BrowserReload();
+      BrowserCommands.reload();
     }
     if (this._popupInitialized) {
       PanelMultiView.hidePopup(this._identityPopup);
@@ -496,7 +498,7 @@ var gIdentityHandler = {
       port,
       gBrowser.contentPrincipal.originAttributes
     );
-    BrowserReloadSkipCache();
+    BrowserCommands.reloadSkipCache();
     if (this._popupInitialized) {
       PanelMultiView.hidePopup(this._identityPopup);
     }
@@ -611,7 +613,7 @@ var gIdentityHandler = {
     // Because "off" is 1 and "off temporarily" is 2, we can just check if the
     // sum of newValue and oldValue is 3.
     if (newValue + oldValue !== 3) {
-      BrowserReloadSkipCache();
+      BrowserCommands.reloadSkipCache();
       if (this._popupInitialized) {
         PanelMultiView.hidePopup(this._identityPopup);
       }
@@ -1260,7 +1262,7 @@ var gIdentityHandler = {
     }
   },
 
-  handleEvent(event) {
+  handleEvent() {
     let elem = document.activeElement;
     let position = elem.compareDocumentPosition(this._identityPopup);
 
@@ -1278,7 +1280,7 @@ var gIdentityHandler = {
     }
   },
 
-  observe(subject, topic, data) {
+  observe(subject, topic) {
     switch (topic) {
       case "perm-changed": {
         // Exclude permissions which do not appear in the UI in order to avoid