[Pkg-mozext-commits] [greasemonkey] 12/43: Get nsIContentFrameMessageManager that doesn't crash.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository greasemonkey.

commit 405480cd2bf96b7bf67c0aceb5968703f1fc883b
Author: Anthony Lieuallen <arantius at gmail.com>
Date:   Tue Nov 4 13:56:31 2014 -0500

    Get nsIContentFrameMessageManager that doesn't crash.
---
 modules/contentObserver.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/contentObserver.js b/modules/contentObserver.js
index 848b3f4..c56df14 100644
--- a/modules/contentObserver.js
+++ b/modules/contentObserver.js
@@ -177,7 +177,7 @@ ContentObserver.prototype.runScripts = function(aRunWhen, aContentWin) {
   }
   */
 
-  var response = this.windowMessageManager(aContentWin).sendSyncMessage(
+  var response = this.contentFrameMessageManager(aContentWin).sendSyncMessage(
     'greasemonkey:scripts-for-url', {
       'url': url,
       'when': aRunWhen,
@@ -210,10 +210,11 @@ ContentObserver.prototype.windowIsTop = function(aContentWin) {
   return true;
 };
 
-ContentObserver.prototype.windowMessageManager = function(aContentWin) {
+ContentObserver.prototype.contentFrameMessageManager = function(aContentWin) {
   return aContentWin.QueryInterface(Ci.nsIInterfaceRequestor)
       .getInterface(Ci.nsIWebNavigation)
-      .QueryInterface(Ci.nsIDocShell)
+      .QueryInterface(Ci.nsIDocShellTreeItem)
+      .rootTreeItem
       .QueryInterface(Ci.nsIInterfaceRequestor)
       .getInterface(Ci.nsIContentFrameMessageManager);
 };

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