[Pkg-mozext-commits] [tabmixplus] 05/34: [e10s] Follow up bug 1109372 - Stop using CPOWs for isTabEmpty

[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 7a71359a0bd9d127524902667eff1aeb158177a1
Author: onemen <tabmix.onemen at gmail.com>
Date:   Tue Mar 3 09:06:21 2015 +0200

    [e10s] Follow up bug 1109372 - Stop using CPOWs for isTabEmpty
---
 chrome/content/links/setup.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/chrome/content/links/setup.js b/chrome/content/links/setup.js
index 8f4dbfa..e0072b8 100644
--- a/chrome/content/links/setup.js
+++ b/chrome/content/links/setup.js
@@ -257,14 +257,12 @@ Tabmix.beforeStartup = function TMP_beforeStartup(tabBrowser, aTabContainer) {
 
     tabBrowser.isBlankBrowser = function TMP_isBlankBrowser(aBrowser, aboutBlank) {
        try{
-          if (!aBrowser)
+          if (!aBrowser || !aBrowser.currentURI)
              return true;
-          return (!aBrowser.sessionHistory || aBrowser.sessionHistory.index < 0 ||
-                  (aBrowser.sessionHistory.count < 2 &&
-                  (!aBrowser.currentURI ||
-                  (aboutBlank ? aBrowser.currentURI.spec == "about:blank" :
-                                Tabmix.isNewTabUrls(aBrowser.currentURI.spec))
-          )));
+          if (aBrowser.canGoForward || aBrowser.canGoBack)
+             return false;
+          return aboutBlank ? aBrowser.currentURI.spec == "about:blank" :
+                 Tabmix.isNewTabUrls(aBrowser.currentURI.spec);
        } catch (ex) {Tabmix.assert(ex); return true;}
     };
 

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