Bug 1173267 - Remove aOptions parameter from SessionStoreInternal.setTabState() r=Mossop
authorTim Taubert <ttaubert@mozilla.com>
Wed, 10 Jun 2015 11:09:09 +0200
changeset 248017 3d8d35663ab13322bf77f0b5c2345840d4934906
parent 248016 72c07a70fae79ca1fa7411b078919ee87b98d11e
child 248018 23d18852de14910d66042b384bdc85e3c9ff9f53
child 248125 f1927654c8960460f10701550a22e69b907011d4
push id13472
push userttaubert@mozilla.com
push dateWed, 10 Jun 2015 18:22:40 +0000
treeherderfx-team@3d8d35663ab1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMossop
bugs1173267
milestone41.0a1
Bug 1173267 - Remove aOptions parameter from SessionStoreInternal.setTabState() r=Mossop
browser/components/sessionstore/SessionStore.jsm
--- 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);