[Pkg-mozext-commits] [tabmixplus] 32/123: [e10s] Follow up bug 1051017 - browser.contentWindow -> browser.contentWindowAsCPOW

[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 cbb4741d571629ef007d1b6e94e90e10cd9384b8
Author: onemen <tabmix.onemen at gmail.com>
Date:   Fri Aug 22 23:08:16 2014 +0300

    [e10s] Follow up bug 1051017 - browser.contentWindow -> browser.contentWindowAsCPOW
---
 chrome/content/session/session.js | 4 ++--
 chrome/content/tab/tab.js         | 4 ++--
 modules/AutoReload.jsm            | 6 +++---
 modules/ContentClick.jsm          | 2 +-
 modules/MergeWindows.jsm          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index 9f3d2ae..fb5f9e5 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -2619,7 +2619,7 @@ try{
          return;
       var aBrowser = gBrowser.getBrowserForTab(aTab);
       if (gBrowser.isBlankBrowser(aBrowser)) return;
-      var bContent = aBrowser.contentWindow;
+      var bContent = aBrowser[TabmixSvc.contentWindowAsCPOW];
       this.setLiteral(this.getNodeForTab(aTab), "scroll", bContent.scrollX + "," + bContent.scrollY);
    },
 
@@ -2701,7 +2701,7 @@ try{
       var sessionHistory = aBrowser.webNavigation.sessionHistory;
       var rdfLabelTab = rdfLabelTabs + "/" + aTab.linkedPanel;
       var index = sessionHistory.index < 0 ? 0 : sessionHistory.index;
-      var bContent = aBrowser.contentWindow;
+      var bContent = aBrowser[TabmixSvc.contentWindowAsCPOW];
       try {
          var curHistory = sessionHistory.getEntryAtIndex(index, false);
          curHistory.QueryInterface(Ci.nsISHEntry).setScrollPosition(bContent.scrollX, bContent.scrollY);
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index f6d806d..4242b7b 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -2002,8 +2002,8 @@ var TabmixProgressListener = {
           Tabmix.autoReload.onTabReloaded(tab, aBrowser);
 
         // disabled name for locked tab, so locked tab don't get reuse
-        if (tab.getAttribute("locked") && aBrowser.contentWindow.name)
-          aBrowser.contentWindow.name = "";
+        if (tab.getAttribute("locked") && aBrowser[TabmixSvc.contentWindowAsCPOW].name)
+          aBrowser[TabmixSvc.contentWindowAsCPOW].name = "";
       }
     }
   }
diff --git a/modules/AutoReload.jsm b/modules/AutoReload.jsm
index 389c073..31d49c5 100644
--- a/modules/AutoReload.jsm
+++ b/modules/AutoReload.jsm
@@ -229,7 +229,7 @@ let AutoReload = {
     if (!TabmixSvc.prefBranch.getBoolPref("reload_match_address") ||
         aTab.autoReloadURI == aBrowser.currentURI.spec) {
       if (aBrowser.curScrollX || aBrowser.curScrollY)
-        aBrowser.contentWindow.scrollTo(aBrowser.curScrollX, aBrowser.curScrollY);
+        aBrowser[TabmixSvc.contentWindowAsCPOW].scrollTo(aBrowser.curScrollX, aBrowser.curScrollY);
 
       if (!aTab.autoReloadEnabled)
         aTab.autoReloadEnabled = true;
@@ -283,8 +283,8 @@ function _reloadTab(aTab) {
     }
   } catch (e) { }
 
-  browser.curScrollX = browser.contentWindow.scrollX;
-  browser.curScrollY = browser.contentWindow.scrollY;
+  browser.curScrollX = browser[TabmixSvc.contentWindowAsCPOW].scrollX;
+  browser.curScrollY = browser[TabmixSvc.contentWindowAsCPOW].scrollY;
   var loadFlags = Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_HISTORY |
                               Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_PROXY |
                               Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE;
diff --git a/modules/ContentClick.jsm b/modules/ContentClick.jsm
index 6452668..e01ba09 100644
--- a/modules/ContentClick.jsm
+++ b/modules/ContentClick.jsm
@@ -855,7 +855,7 @@ let ContentClickInternal = {
       let browsers = aWindow.gBrowser.browsers;
       for (let i = 0; i < browsers.length; i++) {
         let browser = browsers[i];
-        if (isCurrent(browser.contentWindow)) {
+        if (isCurrent(browser[TabmixSvc.contentWindowAsCPOW])) {
           gURLBar.handleRevert();
           // Focus the matching window & tab
           aWindow.focus();
diff --git a/modules/MergeWindows.jsm b/modules/MergeWindows.jsm
index d9789bf..ccaeb8b 100644
--- a/modules/MergeWindows.jsm
+++ b/modules/MergeWindows.jsm
@@ -141,7 +141,7 @@ let MergeWindows = {
         // since we merge popup after all other tabs was merged,
         // we only look for opener in the target window
         let popupWindow = aTab.ownerDocument.defaultView;
-        let openerWindow = popupWindow.gBrowser.contentWindow.opener;
+        let openerWindow = popupWindow.gBrowser.selectedBrowser[TabmixSvc.contentWindowAsCPOW].opener;
         let openerTab = openerWindow &&
             tabbrowser._getTabForContentWindow(openerWindow.top);
         if (openerTab)

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