Bug 1655866: Part 5 - Use native PermitUnload implementation from fro…

…nt-end code. r=nika,mconley Differential Revision: https://phabricator.services.mozilla.com/D88318
iaxat · Sep 21, 2020 · 814e506 · 814e506
1 parent b4c45a3
commit 814e506
Show file tree

Hide file tree

Showing 20 changed files with 147 additions and 793 deletions.
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
@@ -49,7 +49,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PageThumbs: "resource://gre/modules/PageThumbs.jsm",
   PanelMultiView: "resource:///modules/PanelMultiView.jsm",
   PanelView: "resource:///modules/PanelMultiView.jsm",
-  PermitUnloader: "resource://gre/actors/BrowserElementParent.jsm",
   PictureInPicture: "resource://gre/modules/PictureInPicture.jsm",
   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
   PlacesUIUtils: "resource:///modules/PlacesUIUtils.jsm",

diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js
@@ -2307,9 +2307,7 @@
 
     _mayDiscardBrowser(aTab, aForceDiscard) {
       let browser = aTab.linkedBrowser;
-      let permitUnloadFlags = aForceDiscard
-        ? browser.dontPromptAndUnload
-        : browser.dontPromptAndDontUnload;
+      let action = aForceDiscard ? "unload" : "dontUnload";
 
       if (
         !aTab ||
@@ -2318,7 +2316,7 @@
         this._windowIsClosing ||
         !browser.isConnected ||
         !browser.isRemoteBrowser ||
-        !browser.permitUnload(permitUnloadFlags).permitUnload
+        !browser.permitUnload(action).permitUnload
       ) {
         return false;
       }
@@ -3386,7 +3384,7 @@
     _hasBeforeUnload(aTab) {
       let browser = aTab.linkedBrowser;
       if (browser.isRemoteBrowser && browser.frameLoader) {
-        return PermitUnloader.hasBeforeUnload(browser.frameLoader);
+        return browser.hasBeforeUnload;
       }
       return false;
     },

diff --git a/docshell/base/nsIContentViewer.idl b/docshell/base/nsIContentViewer.idl
@@ -59,6 +59,8 @@ interface nsIContentViewer : nsISupports
    * eDontPromptAndDontUnload: Don't prompt and return false (unload not permitted)
    *                           if the document (or its children) asks us to prompt.
    * eDontPromptAndUnload: Don't prompt and return true (unload permitted) no matter what.
+   *
+   * NOTE: Keep this in sync with PermitUnloadAction in WindowGlobalActors.webidl.
    */
   cenum PermitUnloadAction : 8 {
     ePrompt = 0,

diff --git a/docshell/test/browser/browser.ini b/docshell/test/browser/browser.ini
@@ -39,11 +39,6 @@ support-files =
   file_bug1328501.html
   file_bug1328501_frame.html
   file_bug1328501_framescript.js
-  file_bug1415918_beforeunload_2.html
-  file_bug1415918_beforeunload_3.html
-  file_bug1415918_beforeunload_iframe_2.html
-  file_bug1415918_beforeunload_iframe.html
-  file_bug1415918_beforeunload.html
   file_bug1543077-1-child.html
   file_bug1543077-1.html
   file_bug1543077-2-child.html