[Pkg-mozext-commits] [tabmixplus] 08/61: Use 'remote' attribute from browser instead of tab, Follow up bug 1095475 - [e10s] Replace tab underlines with tooltip

[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 1dc910059380e4c51a0375d820cf948f16607fec
Author: onemen <tabmix.onemen at gmail.com>
Date:   Fri Jul 10 14:28:20 2015 +0300

    Use 'remote' attribute from browser instead of tab, Follow up bug 1095475 - [e10s] Replace tab underlines with tooltip
---
 chrome/content/click/click.js  | 2 +-
 chrome/content/minit/tablib.js | 7 +++----
 modules/AutoReload.jsm         | 2 +-
 modules/ContentClick.jsm       | 2 +-
 modules/MergeWindows.jsm       | 7 ++++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/chrome/content/click/click.js b/chrome/content/click/click.js
index f257fb7..65b8e02 100644
--- a/chrome/content/click/click.js
+++ b/chrome/content/click/click.js
@@ -636,7 +636,7 @@ var TabmixContext = {
 
       // for remote tab get call getValidUrl when it is safe to use CPOWs
       // getValidUrl may call getParamsForLink
-      if (tab.getAttribute("remote") == "true" &&
+      if (tab.linkedBrowser.getAttribute("remote") == "true" &&
           onLink && (Tabmix.prefs.getBoolPref("openLinkHere") ||
                      Tabmix.prefs.getBoolPref("openInverseLink") ||
                      Tabmix.prefs.getBoolPref("linkWithHistory"))) {
diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index f600f28..23a020b 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -1083,8 +1083,8 @@ var tablib = {
         return true;
       };
 
-      let tab = gBrowser.selectedTab;
-      if (tab.getAttribute("remote") == "true" &&
+      let browser = gBrowser.selectedBrowser;
+      if (browser.getAttribute("remote") == "true" &&
           typeof gContextMenu.tabmixLinkURL != "undefined")
         return gContextMenu.tabmixLinkURL;
 
@@ -1093,8 +1093,7 @@ var tablib = {
                     altKey: false, target: {},
                     tabmix_openLinkWithHistory: true};
         let result = Tabmix.ContentClick.getParamsForLink(json,
-              target, url,
-              tab.linkedBrowser, document.commandDispatcher.focusedWindow);
+              target, url, browser, document.commandDispatcher.focusedWindow);
         return result._href && isValid(result._href) ? result._href : null;
       }
       return url;
diff --git a/modules/AutoReload.jsm b/modules/AutoReload.jsm
index 605b096..719f379 100644
--- a/modules/AutoReload.jsm
+++ b/modules/AutoReload.jsm
@@ -296,7 +296,7 @@ function _reloadTab(aTab) {
   }
 
   var browser = aTab.linkedBrowser;
-  if (TabmixSvc.version(330) && aTab.getAttribute("remote")) {
+  if (TabmixSvc.version(330) && browser.getAttribute("remote")) {
     browser.messageManager.sendAsyncMessage("Tabmix:collectReloadData");
     return;
   }
diff --git a/modules/ContentClick.jsm b/modules/ContentClick.jsm
index 4f21d49..327e1be 100644
--- a/modules/ContentClick.jsm
+++ b/modules/ContentClick.jsm
@@ -1007,7 +1007,7 @@ var ContentClickInternal = {
       }
       if (tab) {
         let browser = tab.linkedBrowser;
-        if (tab.getAttribute("remote") == "true") {
+        if (browser.getAttribute("remote") == "true") {
           browser.messageManager
                  .sendAsyncMessage("Tabmix:isFrameInContent", this.frameData);
         }
diff --git a/modules/MergeWindows.jsm b/modules/MergeWindows.jsm
index 5e9e23f..07cabc5 100644
--- a/modules/MergeWindows.jsm
+++ b/modules/MergeWindows.jsm
@@ -174,12 +174,13 @@ this.MergeWindows = {
       if (isPopup) {
         let openerWindow;
         if (placePopupNextToOpener) {
-          if (TabmixSvc.version(330) && tab.getAttribute("remote") == "true") {
-            tab.linkedBrowser.messageManager.sendAsyncMessage("Tabmix:collectOpener");
+          let browser = tab.linkedBrowser;
+          if (TabmixSvc.version(330) && browser.getAttribute("remote") == "true") {
+            browser.messageManager.sendAsyncMessage("Tabmix:collectOpener");
             tab.__tabmixNewTab = newTab;
             return;
           }
-          openerWindow = tab.linkedBrowser.contentWindow.opener;
+          openerWindow = browser.contentWindow.opener;
         }
         this.moveTabsFromPopups(newTab, tab, openerWindow, tabbrowser);
       }

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