author | Tim Taubert <ttaubert@mozilla.com> |
Wed, 10 Jun 2015 11:09:09 +0200 | |
changeset 248155 | 3d8d35663ab13322bf77f0b5c2345840d4934906 |
parent 248154 | 72c07a70fae79ca1fa7411b078919ee87b98d11e |
child 248156 | f1927654c8960460f10701550a22e69b907011d4 |
child 248384 | 23d18852de14910d66042b384bdc85e3c9ff9f53 |
push id | 60888 |
push user | kwierso@gmail.com |
push date | Thu, 11 Jun 2015 01:38:38 +0000 |
treeherder | mozilla-inbound@39e638ed06bf [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | Mossop |
bugs | 1173267 |
milestone | 41.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/components/sessionstore/SessionStore.jsm +++ b/browser/components/sessionstore/SessionStore.jsm @@ -1747,17 +1747,17 @@ let SessionStoreInternal = { throw Components.Exception("Default view is not tracked", Cr.NS_ERROR_INVALID_ARG); } let tabState = TabState.collect(aTab); return JSON.stringify(tabState); }, - setTabState: function ssi_setTabState(aTab, aState, aOptions) { + setTabState(aTab, aState) { // Remove the tab state from the cache. // Note that we cannot simply replace the contents of the cache // as |aState| can be an incomplete state that will be completed // by |restoreTabs|. let tabState = JSON.parse(aState); if (!tabState) { throw Components.Exception("Invalid state string: not JSON", Cr.NS_ERROR_INVALID_ARG); } @@ -1772,17 +1772,17 @@ let SessionStoreInternal = { if (!("__SSi" in window)) { throw Components.Exception("Window is not tracked", Cr.NS_ERROR_INVALID_ARG); } if (aTab.linkedBrowser.__SS_restoreState) { this._resetTabRestoringState(aTab); } - this.restoreTab(aTab, tabState, aOptions); + this.restoreTab(aTab, tabState); }, duplicateTab: function ssi_duplicateTab(aWindow, aTab, aDelta = 0) { if (!aTab.ownerDocument.defaultView.__SSi) { throw Components.Exception("Default view is not tracked", Cr.NS_ERROR_INVALID_ARG); } if (!aWindow.gBrowser) { throw Components.Exception("Invalid window object: no gBrowser", Cr.NS_ERROR_INVALID_ARG);