Bug 803112 - Handle AccessFu startup when there is no current browser yet. r=davidb

This commit is contained in:
Eitan Isaacson 2012-10-19 10:06:07 -07:00
parent cf6faf87d0
commit 482391e3f1

View File

@ -89,7 +89,8 @@ var Utils = {
},
getCurrentContentDoc: function getCurrentContentDoc(aWindow) {
return this.getCurrentBrowser(aWindow).contentDocument;
let browser = this.getCurrentBrowser(aWindow);
return browser ? browser.contentDocument : null;
},
getMessageManager: function getMessageManager(aBrowser) {
@ -108,13 +109,14 @@ var Utils = {
for (let i = 0; i < aWindow.messageManager.childCount; i++)
messageManagers.push(aWindow.messageManager.getChildAt(i));
let remoteframes = this.getCurrentContentDoc(aWindow).
querySelectorAll('iframe[remote=true]');
let document = this.getCurrentContentDoc(aWindow);
for (let i = 0; i < remoteframes.length; ++i)
messageManagers.push(this.getMessageManager(remoteframes[i]));
if (document) {
let remoteframes = document.querySelectorAll('iframe[remote=true]');
Logger.info(messageManagers.length);
for (let i = 0; i < remoteframes.length; ++i)
messageManagers.push(this.getMessageManager(remoteframes[i]));
}
return messageManagers;
},