chore: followup bug 1034036 - Part 4: move away from keeping state on the living objects

Author: onemen

addon/chrome/content/click/click.js

@@ -201,8 +201,9 @@ var TabmixTabClickOptions = {
         Tabmix.duplicateTab(aTab);
         break;
       case 4:
-        if (aTab.linkedBrowser.__SS_restoreState != 2)
+        if (aTab._restoreState != 2) {
           gBrowser.reloadTab(aTab);
+        }
         break;
       case 5:
         gBrowser.protectTab(aTab);

addon/chrome/content/minit/tablib.js

@@ -1774,7 +1774,7 @@ Tabmix.tablib = {
       return;
 
     if (aBrowser.getAttribute("remote") == "true" &&
-        aBrowser.__SS_restoreState == 2 &&
+        aTab._restoreState == 2 &&
         this.labels.indexOf(aTab.label) > -1) {
       return;
     }
@@ -1946,7 +1946,7 @@ Tabmix.tablib = {
     let l = tabs.length;
     for (let i = 0; i < l; i++) {
       let tab = tabs[i];
-      if (tab != skipTab && tab.linkedBrowser.__SS_restoreState != 2) {
+      if (tab != skipTab && tab._restoreState != 2) {
         try {
           tab.linkedBrowser.reload();
         } catch {}

addon/chrome/content/places/places.js

@@ -380,7 +380,7 @@ var TMP_Places = {
     this.bookmarksOnDemand = restoreOnDemand;
 
     tabs.forEach(tab => {
-      if (tab.linkedBrowser.__SS_restoreState) {
+      if (tab._restoreState) {
         TabmixSvc.SessionStore._resetTabRestoringState(tab);
       }
     });
@@ -411,7 +411,7 @@ var TMP_Places = {
   restoringTabs: [],
 
   resetRestoreState(tab) {
-    if (tab.linkedBrowser.__SS_restoreState) {
+    if (tab._restoreState) {
       TabmixSvc.SessionStore._resetTabRestoringState(tab);
     }
     this.updateRestoringTabsList(tab);

addon/chrome/content/session/session.js

@@ -3300,8 +3300,9 @@ TabmixSessionManager = {
     if (overwrite) {
       for (let i = 0; i < gBrowser.tabs.length; i++) {
         let tab = gBrowser.tabs[i];
-        if (gBrowser.browsers[i].__SS_restoreState)
+        if (tab._restoreState) {
           TabmixSvc.SessionStore._resetTabRestoringState(tab);
+        }
       }
     }
     TabmixSvc.SessionStore.restoreTabs(window, tabs, tabsData, 0);

addon/chrome/content/tab/tabBindings.js

@@ -165,7 +165,15 @@
           const {height, y} = this.getBoundingClientRect();
           return height + y;
         }
-      }
+      },
+      '_restoreState': {
+        get() {
+          if (this.hasAttribute("pending") || this.hasAttribute("tabmix_pending")) {
+            return TabmixSvc.sm.TAB_STATE_NEEDS_RESTORE;
+          }
+          return SessionStore.getInternalObjectState(this.linkedBrowser);
+        }
+      },
     });
 
     /**

addon/modules/TabmixSvc.jsm

@@ -442,4 +442,12 @@ TabmixChromeUtils.defineLazyGetter(TabmixSvc, "SessionStore", function() {
   return this.SessionStoreGlobal.SessionStoreInternal;
 });
 
+TabmixChromeUtils.defineLazyGetter(TabmixSvc.sm, "TAB_STATE_NEEDS_RESTORE", () => {
+  return TabmixSvc.SessionStoreGlobal.TAB_STATE_NEEDS_RESTORE;
+});
+
+TabmixChromeUtils.defineLazyGetter(TabmixSvc.sm, "TAB_STATE_RESTORING", () => {
+  return TabmixSvc.SessionStoreGlobal.TAB_STATE_RESTORING;
+});
+
 TabmixSvc.loadDefaultPreferences();

types/tabmix.d.ts

@@ -139,6 +139,8 @@ declare namespace TabmixModules {
     SessionStoreGlobal: any;
     skipSingleWindowModeCheck: boolean;
     sm: {
+      TAB_STATE_NEEDS_RESTORE: number;
+      TAB_STATE_RESTORING: number;
       crashed: boolean;
       lastSessionPath: string | null;
       settingPreference: boolean;