Bug 650573 - Panorama hangs when restoring a session; f=raymond, r=sdwilsh

browser/base/content/tabview/groupitems.js

@@ -2163,7 +2163,16 @@ let GroupItems = {
         }
 
         toClose.forEach(function(groupItem) {
-          groupItem.destroy({immediately: true});
+          // All remaining children in to-be-closed groups are re-used by
+          // session restore. Reconnect them so that they're put into their
+          // right groups.
+          groupItem.getChildren().forEach(function (tabItem) {
+            if (tabItem.parent && tabItem.parent.hidden)
+              iQ(tabItem.container).show();
+            tabItem._reconnected = false;
+            tabItem._reconnect();
+          });
+          groupItem.close({immediately: true});
         });
       }
 

browser/base/content/tabview/ui.js

@@ -742,7 +742,7 @@ let UI = {
       } else {
         // If we're currently in the process of entering private browsing,
         // we don't want to go to the Tab View UI. 
-        if (self._privateBrowsing.transitionMode)
+        if (self._storageBusyCount)
           return;
 
         // if not closing the last tab

browser/base/content/test/tabview/Makefile.in

@@ -137,6 +137,7 @@ _BROWSER_FILES = \
                  browser_tabview_bug648882.js \
                  browser_tabview_bug649006.js \
                  browser_tabview_bug649307.js \
+                 browser_tabview_bug650573.js \
                  browser_tabview_bug651311.js \
                  browser_tabview_bug654941.js \
                  browser_tabview_bug656778.js \

browser/base/content/test/tabview/browser_tabview_bug624727.js

@@ -62,7 +62,10 @@ function test() {
   let testStateAfterEnteringPB = function () {
     let prefix = 'enter';
     ok(!pb.privateBrowsingEnabled, prefix + ': private browsing is disabled');
-    registerCleanupFunction(function () pb.privateBrowsingEnabled = false);
+    registerCleanupFunction(function () {
+      if (pb.privateBrowsingEnabled)
+        pb.privateBrowsingEnabled = false
+    });
 
     togglePrivateBrowsing(function () {
       assertTabViewIsHidden(prefix);

browser/base/content/test/tabview/browser_tabview_bug629195.js

@@ -109,6 +109,6 @@ function restore(groupId) {
     }]
   };
   let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
-  ss.setWindowState(win, JSON.stringify(newState), false);
+  ss.setWindowState(win, JSON.stringify(newState), true);
 }
 

browser/base/content/test/tabview/browser_tabview_bug650573.js

@@ -0,0 +1,100 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
+let stateBackup = ss.getBrowserState();
+
+function test() {
+  waitForExplicitFinish();
+
+  registerCleanupFunction(function () {
+    ss.setBrowserState(stateBackup);
+  });
+
+  TabView._initFrame(function() {
+    executeSoon(testRestoreNormal);
+  });
+}
+
+function testRestoreNormal() {
+  testRestore("normal", function () {
+    waitForBrowserState(JSON.parse(stateBackup), testRestorePinned);
+  });
+}
+
+function testRestorePinned() {
+  gBrowser.loadOneTab("about:blank", {inBackground: true});
+  gBrowser.pinTab(gBrowser.tabs[0]);
+
+  testRestore("pinned", function () {
+    waitForBrowserState(JSON.parse(stateBackup), testRestoreHidden);
+  });
+}
+
+function testRestoreHidden() {
+  let groupItem = createGroupItemWithBlankTabs(window, 20, 20, 20, 1);
+  let tabItem = groupItem.getChild(0);
+
+  hideGroupItem(groupItem, function () {
+    testRestore("hidden", function () {
+      isnot(tabItem.container.style.display, "none", "tabItem is visible");
+      waitForFocus(finish);
+    });
+  });
+}
+
+function testRestore(prefix, callback) {
+  waitForBrowserState(createBrowserState(), function () {
+    is(gBrowser.tabs.length, 2, prefix + ": two tabs restored");
+
+    let cw = TabView.getContentWindow();
+    is(cw.GroupItems.groupItems.length, 2, prefix + ": we have two groupItems");
+
+    let [groupItem1, groupItem2] = cw.GroupItems.groupItems;
+    is(groupItem1.id, "1st-group-id", prefix + ": groupItem1's ID is valid");
+    is(groupItem1.getChildren().length, 1, prefix + ": groupItem1 has one child");
+
+    is(groupItem2.id, "2nd-group-id", prefix + ": groupItem2's ID is valid");
+    is(groupItem2.getChildren().length, 1, prefix + ": groupItem2 has one child");
+
+    callback();
+  });
+}
+
+function waitForBrowserState(state, callback) {
+  window.addEventListener("SSWindowStateReady", function onReady() {
+    window.removeEventListener("SSWindowStateReady", onReady, false);
+    executeSoon(callback);
+  }, false);
+
+  ss.setBrowserState(JSON.stringify(state));
+}
+
+function createBrowserState() {
+  let bounds = {left: 20, top: 20, width: 20, height: 20};
+
+  let tabViewGroups = {nextID: 99, activeGroupId: 1};
+  let tabViewGroup = {
+    "1st-group-id": {bounds: bounds, title: "new group 1", id: "1st-group-id"},
+    "2nd-group-id": {bounds: bounds, title: "new group 2", id: "2nd-group-id"}
+  };
+
+  let tab1Data = {bounds: bounds, url: "about:robots", groupID: "2nd-group-id"};
+  let tab1 = {
+    entries: [{url: "about:robots"}],
+    extData: {"tabview-tab": JSON.stringify(tab1Data)}
+  };
+
+  let tab2Data = {bounds: bounds, url: "about:mozilla", groupID: "1st-group-id"};
+  let tab2 = {
+    entries: [{url: "about:mozilla"}],
+    extData: {"tabview-tab": JSON.stringify(tab2Data)}
+  };
+
+  return {windows: [{
+    tabs: [tab1, tab2],
+    selected: 1,
+    extData: {"tabview-groups": JSON.stringify(tabViewGroups),
+    "tabview-group": JSON.stringify(tabViewGroup)}
+  }]};
+}