From 8eaf5d4a225375f28cba4fd8ee6eb404d0fd554e Mon Sep 17 00:00:00 2001 From: Sindre Dammann Date: Fri, 22 Oct 2010 17:13:37 -0700 Subject: [PATCH] Bug 579868 - Restoring A Normal Closed Tab that was once a App Tab causes it to turn back into a App tab when restored [r=zpao, a=blocking2.0:betaN] --- .../sessionstore/src/nsSessionStore.js | 22 +++++- .../sessionstore/test/browser/Makefile.in | 1 + .../test/browser/browser_579868.js | 71 +++++++++++++++++++ 3 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 browser/components/sessionstore/test/browser/browser_579868.js diff --git a/browser/components/sessionstore/src/nsSessionStore.js b/browser/components/sessionstore/src/nsSessionStore.js index ee6f716032e4..4d491b15cc84 100644 --- a/browser/components/sessionstore/src/nsSessionStore.js +++ b/browser/components/sessionstore/src/nsSessionStore.js @@ -1400,9 +1400,22 @@ SessionStoreService.prototype = { if (!browser || !browser.currentURI) // can happen when calling this function right after .addTab() return tabData; - else if (browser.__SS_data && browser.__SS_data._tabStillLoading) + else if (browser.__SS_data && browser.__SS_data._tabStillLoading) { // use the data to be restored when the tab hasn't been completely loaded - return browser.__SS_data; + tabData = browser.__SS_data; + if (aTab.pinned) + tabData.pinned = true; + else + delete tabData.pinned; + if (browser.userTypedValue) { + tabData.userTypedValue = browser.userTypedValue; + tabData.userTypedClear = browser.userTypedClear; + } else { + delete tabData.userTypedValue; + delete tabData.userTypedClear; + } + return tabData; + } var history = null; try { @@ -1443,10 +1456,15 @@ SessionStoreService.prototype = { if (browser.userTypedValue) { tabData.userTypedValue = browser.userTypedValue; tabData.userTypedClear = browser.userTypedClear; + } else { + delete tabData.userTypedValue; + delete tabData.userTypedClear; } if (aTab.pinned) tabData.pinned = true; + else + delete tabData.pinned; tabData.hidden = aTab.hidden; var disallow = []; diff --git a/browser/components/sessionstore/test/browser/Makefile.in b/browser/components/sessionstore/test/browser/Makefile.in index a6a3443bf8db..d0c3646c4f74 100644 --- a/browser/components/sessionstore/test/browser/Makefile.in +++ b/browser/components/sessionstore/test/browser/Makefile.in @@ -114,6 +114,7 @@ _BROWSER_TEST_FILES = \ browser_522545.js \ browser_524745.js \ browser_528776.js \ + browser_579868.js \ browser_579879.js \ browser_580512.js \ browser_586147.js \ diff --git a/browser/components/sessionstore/test/browser/browser_579868.js b/browser/components/sessionstore/test/browser/browser_579868.js new file mode 100644 index 000000000000..f76c76b55d03 --- /dev/null +++ b/browser/components/sessionstore/test/browser/browser_579868.js @@ -0,0 +1,71 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is bug 579868 test. + * + * The Initial Developer of the Original Code is + * Sindre Dammann + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +function test() { + let tab1 = gBrowser.addTab("about:robots"); + let tab2 = gBrowser.addTab("about:credits"); + tab1.addEventListener("load", mainPart, true); + waitForExplicitFinish(); + + function mainPart() { + // Tell the session storer that the tab is pinned + // and that userTypedValue is "Hello World!" + let newTabState = '{"entries":[{"url":"about:robots"}],"pinned":true,"userTypedValue":"Hello World!"}'; + let ss = Cc["@mozilla.org/browser/sessionstore;1"] + .getService(Ci.nsISessionStore); + ss.setTabState(tab1, newTabState); + + // Undo pinning and userTypedValue + gBrowser.unpinTab(tab1); + tab1.linkedBrowser.userTypedValue = null; + + is(tab1.linkedBrowser.__SS_data._tabStillLoading, true, + "_tabStillLoading should be true."); + + // Close and restore tab + gBrowser.removeTab(tab1); + let savedState = JSON.parse(ss.getClosedTabData(window))[0].state; + isnot(savedState.pinned, true, "Pinned should not be true"); + isnot(savedState.userTypedValue, "Hello World!", + "userTypedValue should not be Hello World!"); + tab1 = ss.undoCloseTab(window, 0); + + isnot(tab1.pinned, true, "Should not be pinned"); + gBrowser.removeTab(tab1); + gBrowser.removeTab(tab2); + finish(); + } +}