[Pkg-mozext-commits] [tabmixplus] 25/61: Follow up bug 1109875 - [e10s] Stop using synchronous TabState.flush operations for onTabClose

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit e63c5c3c095f5dde7fb41ff24d1c12c2ac5e35ab
Author: onemen <tabmix.onemen at gmail.com>
Date:   Mon Jul 27 19:03:06 2015 +0300

    Follow up bug 1109875 - [e10s] Stop using synchronous TabState.flush operations for onTabClose
---
 chrome/content/session/session.js      | 6 ++++++
 chrome/content/session/sessionStore.js | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index 527a51f..b460819 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -2721,6 +2721,7 @@ try{
          } else tabContainer.RemoveElement(nodeToClose, true);
          if (tabExist) {
             closedTabContainer.AppendElement(nodeToClose);
+            this.setLiteral(nodeToClose, "closedAt", Date.now());
             if (closedTabContainer.GetCount() > Services.prefs.getIntPref("browser.sessionstore.max_tabs_undo"))
                this.deleteClosedtabAt(1, this.gThisWin);
          }
@@ -2912,6 +2913,8 @@ try{
       this.setLiteral   (aNode, "properties", aData.properties);
       this.setLiteral   (aNode, "history",    aData.history);
       this.setLiteral   (aNode, "scroll",     aData.scroll);
+      if (aData.closedAt)
+         this.setLiteral(aNode, "closedAt", aData.closedAt);
    },
 
   /**
@@ -3527,6 +3530,8 @@ try{
          var newNode = this.RDFService.GetResource(rdfLabelSession);
          var data = {};
          data.pos = this.getIntValue(rdfNodeSession, "tabPos");
+         let closedAt = this.getLiteralValue(rdfNodeSession, "closedAt");
+         data.closedAt = parseInt(closedAt) || Date.now();
          data.image = this.getLiteralValue(rdfNodeSession, "image");
          data.properties = this.getLiteralValue(rdfNodeSession, "properties");
          data.scroll = this.getLiteralValue(rdfNodeSession, "scroll");
@@ -3594,6 +3599,7 @@ try{
       if (!data)
          return false;
       data.pos = aTabData.pos;
+      data.closedAt = aTabData.closedAt || Date.now();
       data.image = aTabData.image;
       // closed tab can not be protected - set protected to 0
       var _locked = TMP_SessionStore._getAttribute(tabState, "_locked") != "false" ? "1" : "0";
diff --git a/chrome/content/session/sessionStore.js b/chrome/content/session/sessionStore.js
index f043722..1855767 100644
--- a/chrome/content/session/sessionStore.js
+++ b/chrome/content/session/sessionStore.js
@@ -801,6 +801,8 @@ var TabmixConvertSession = { // jshint ignore:line
             closedTab.title = closedTab.state.entries[closedTab.state.index - 1].title;
             closedTab.image = state.image;
             closedTab.pos = TabmixSessionManager.getIntValue(rdfNodeTab, "tabPos");
+            let closedAt = TabmixSessionManager.getLiteralValue(rdfNodeTab, "closedAt");
+            closedTab.closedAt = parseInt(closedAt) || Date.now();
             // we use revers order in the RDF format
             _tabs.unshift(closedTab);
          }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git