[Pkg-mozext-commits] [tabmixplus] 11/34: [e10s] Accessing remote tabs webNavigation.sessionHistory warn “unsafe CPOW usage” to the console

[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 44fafb38ad63eeafd5e0cf3845c72a42323d246b
Author: onemen <tabmix.onemen at gmail.com>
Date:   Fri Feb 20 12:33:28 2015 +0200

    [e10s] Accessing remote tabs webNavigation.sessionHistory warn “unsafe CPOW usage” to the console
---
 chrome/content/content.js      | 10 +++++++++-
 chrome/content/minit/tablib.js |  9 ++++++---
 chrome/content/tabmix.js       |  1 +
 modules/Utils.jsm              | 19 +++++++++++++++++++
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/chrome/content/content.js b/chrome/content/content.js
index e29876c..03cfea8 100644
--- a/chrome/content/content.js
+++ b/chrome/content/content.js
@@ -17,6 +17,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "LinkNodeUtils",
 XPCOMUtils.defineLazyModuleGetter(this, "ContextMenu",
   "resource://tabmixplus/ContextMenu.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "TabmixUtils",
+  "resource://tabmixplus/Utils.jsm");
+
 let global = this;
 
 let TabmixContentHandler = {
@@ -24,7 +27,8 @@ let TabmixContentHandler = {
     "Tabmix:restorePermissions",
     "Tabmix:collectPermissions",
     "Tabmix:resetContentName",
-    "Tabmix:sendDOMTitleChanged"
+    "Tabmix:sendDOMTitleChanged",
+    "Tabmix:updateHistoryTitle",
   ],
 
   init: function () {
@@ -59,6 +63,10 @@ let TabmixContentHandler = {
         if (title)
           sendAsyncMessage("DOMTitleChanged", { title: title });
         break;
+      case "Tabmix:updateHistoryTitle":
+        let history = docShell.QueryInterface(Ci.nsIWebNavigation).sessionHistory;
+        TabmixUtils.updateHistoryTitle(history, data.title);
+        break;
     }
   },
 
diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index 4017c87..2a8ac9d 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -914,9 +914,12 @@ var tablib = {
         try {
           this.removeEventListener("SSTabRestored", updateNewHistoryTitle, true);
           let browser = this.linkedBrowser;
-          var history = browser.webNavigation.sessionHistory;
-          var shEntry = history.getEntryAtIndex(history.index, false).QueryInterface(Ci.nsISHEntry);
-          shEntry.setTitle(this.label);
+          if (Tabmix.isVersion(320))
+            browser.messageManager.sendAsyncMessage("Tabmix:updateHistoryTitle", {title: this.label});
+          else {
+            let history = browser.webNavigation.sessionHistory;
+            Tabmix.Utils.updateHistoryTitle(history, this.label);
+          }
         } catch (ex) {Tabmix.assert(ex);}
       }
       function urlForDownload() {
diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index 22842d2..925fc29 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -361,6 +361,7 @@ var TMP_eventListener = {
       Tabmix.lazy_import(TabmixSessionManager, "_decode", "Decode", "Decode");
       Tabmix.lazy_import(Tabmix, "docShellCapabilities",
         "DocShellCapabilities", "DocShellCapabilities", true, [window]);
+      Tabmix.lazy_import(Tabmix, "Utils", "Utils", "TabmixUtils");
     } catch (ex) {Tabmix.assert(ex);}
 
     this._tabEvents = ["SSTabRestoring", "PrivateTab:PrivateChanged",
diff --git a/modules/Utils.jsm b/modules/Utils.jsm
new file mode 100644
index 0000000..ef111de
--- /dev/null
+++ b/modules/Utils.jsm
@@ -0,0 +1,19 @@
+"use strict";
+
+var EXPORTED_SYMBOLS = ["TabmixUtils"];
+
+const {interfaces: Ci, utils: Cu} = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyModuleGetter(this, "Services",
+  "resource://gre/modules/Services.jsm");
+
+
+this.TabmixUtils = {
+  // change current history title
+  updateHistoryTitle: function(history, title) {
+    var shEntry = history.getEntryAtIndex(history.index, false).QueryInterface(Ci.nsISHEntry);
+    shEntry.setTitle(title);
+  }
+};

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