Bug 384278 - Added additional state variable to store window state be…

…fore window minimization. r=mikedeboer

Current window state in the sessionstore system includes `sizeMode` which can be "normal", "minimized", "maximized". However, the OS also remembers whether the window was "normal" or "maximized" before minimization to restore it appropriately. With this fix, sessionstore does likewise.

Differential Revision: https://phabricator.services.mozilla.com/D13234

browser/components/sessionstore/SessionStore.jsm

@@ -3380,6 +3380,9 @@ var SessionStoreInternal = {
       winData[aAttr] = this._getWindowDimension(aWindow, aAttr);
     }, this);
 
+    if (winData.sizemode != "minimized")
+      winData.sizemodeBeforeMinimized = winData.sizemode;
+
     var hidden = WINDOW_HIDEABLE_FEATURES.filter(function(aItem) {
       return aWindow[aItem] && !aWindow[aItem].visible;
     });
@@ -4338,7 +4341,8 @@ var SessionStoreInternal = {
         +(aWinData.height || 0),
         "screenX" in aWinData ? +aWinData.screenX : NaN,
         "screenY" in aWinData ? +aWinData.screenY : NaN,
-        aWinData.sizemode || "", aWinData.sidebar || "");
+        aWinData.sizemode || "", aWinData.sizemodeBeforeMinimized || "",
+        aWinData.sidebar || "");
     }, 0);
   },
 
@@ -4354,10 +4358,12 @@ var SessionStoreInternal = {
    *        Window top
    * @param aSizeMode
    *        Window size mode (eg: maximized)
+   * @param aSizeModeBeforeMinimized
+   *        Window size mode before window got minimized (eg: maximized)
    * @param aSidebar
    *        Sidebar command
    */
-  restoreDimensions: function ssi_restoreDimensions(aWindow, aWidth, aHeight, aLeft, aTop, aSizeMode, aSidebar) {
+  restoreDimensions: function ssi_restoreDimensions(aWindow, aWidth, aHeight, aLeft, aTop, aSizeMode, aSizeModeBeforeMinimized, aSidebar) {
     var win = aWindow;
     var _this = this;
     function win_(aName) { return _this._getWindowDimension(win, aName); }
@@ -4426,12 +4432,15 @@ var SessionStoreInternal = {
           aWindow.resizeTo(aWidth, aHeight);
         }
       }
+      this._windows[aWindow.__SSi].sizemodeBeforeMinimized = aSizeModeBeforeMinimized;
       if (aSizeMode && win_("sizemode") != aSizeMode && !gResistFingerprintingEnabled) {
         switch (aSizeMode) {
         case "maximized":
           aWindow.maximize();
           break;
         case "minimized":
+          if (aSizeModeBeforeMinimized == "maximized")
+            aWindow.maximize();
           aWindow.minimize();
           break;
         case "normal":

browser/components/sessionstore/test/browser.ini

@@ -126,6 +126,7 @@ support-files =
   file_sessionHistory_hashchange.html
 [browser_sessionStorage.js]
 [browser_sessionStorage_size.js]
+[browser_sizemodeBeforeMinimized.js]
 [browser_tab_label_during_restore.js]
 [browser_swapDocShells.js]
 [browser_switch_remoteness.js]

browser/components/sessionstore/test/browser_sizemodeBeforeMinimized.js

@@ -0,0 +1,40 @@
+add_task(async function test() {
+  // Test for bugfix 384278. Confirms that sizemodeBeforeMinimized is set properly when window state is saved.
+  let win = await BrowserTestUtils.openNewBrowserWindow();
+
+  async function changeSizeMode(mode) {
+    let promise = BrowserTestUtils.waitForEvent(win, "sizemodechange");
+    win[mode]();
+    await promise;
+  }
+
+  function checkCurrentState(sizemodeBeforeMinimized) {
+    let state = JSON.parse(ss.getWindowState(win));
+    let winState = state.windows[0];
+    is(winState.sizemodeBeforeMinimized, sizemodeBeforeMinimized, "sizemodeBeforeMinimized should match");
+  }
+
+  // Note: Uses ss.getWindowState(win); as a more time efficient alternative to forceSaveState(); (causing timeouts).
+  // Simulates FF restart.
+
+  if (win.windowState != win.STATE_NORMAL) {
+    await changeSizeMode("restore");
+  }
+  ss.getWindowState(win);
+  await changeSizeMode("minimize");
+  checkCurrentState("normal");
+
+  // Need to create new window or test will timeout on linux.
+  await BrowserTestUtils.closeWindow(win);
+  win = await BrowserTestUtils.openNewBrowserWindow();
+
+  if (win.windowState != win.STATE_MAXIMIZED) {
+    await changeSizeMode("maximize");
+  }
+  ss.getWindowState(win);
+  await changeSizeMode("minimize");
+  checkCurrentState("maximized");
+
+  // Clean up.
+  await BrowserTestUtils.closeWindow(win);
+});