[Pkg-mozext-commits] [tabmixplus] 13/27: [e10s] Make sure webNavigation.sessionHistory exist

[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 de7e9981c8b609dcc3962b446fe70c249c03645d
Author: onemen <tabmix.onemen at gmail.com>
Date:   Wed Dec 3 22:49:04 2014 +0200

    [e10s] Make sure webNavigation.sessionHistory exist
---
 chrome/content/session/session.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index ab486b4..4f5447e 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -2816,6 +2816,8 @@ try{
       }
 
       var sessionHistory = aBrowser.webNavigation.sessionHistory;
+      if (!sessionHistory)
+        return false;
       var rdfLabelTab = rdfLabelTabs + "/" + aTab.linkedPanel;
       var index = sessionHistory.index < 0 ? 0 : sessionHistory.index;
       var bContent = aBrowser[TabmixSvc.contentWindowAsCPOW];
@@ -3354,9 +3356,11 @@ try{
       browser.stop();
       // reset old history
       let history = browser.webNavigation.sessionHistory;
-      if (history.count > 0)
-        history.PurgeHistory(history.count);
-      history.QueryInterface(Ci.nsISHistoryInternal);
+      if (history) {
+        if (history.count > 0)
+          history.PurgeHistory(history.count);
+        history.QueryInterface(Ci.nsISHistoryInternal);
+      }
 
       if (TabmixTabbar.hideMode != 2 && TabmixTabbar.widthFitTitle && !aTab.hasAttribute("width"))
         aTab.setAttribute("width", aTab.getBoundingClientRect().width);

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