diff --git a/browser/modules/BrowserWindowTracker.jsm b/browser/modules/BrowserWindowTracker.jsm index 6a23f25ad220..49da1ba86108 100644 --- a/browser/modules/BrowserWindowTracker.jsm +++ b/browser/modules/BrowserWindowTracker.jsm @@ -40,7 +40,7 @@ function _updateCurrentContentOuterWindowID(browser) { return; } - debug("Current window uri=" + browser.currentURI.spec + + debug("Current window uri=" + (browser.currentURI && browser.currentURI.spec) + " id=" + browser.outerWindowID); _lastTopLevelWindowID = browser.outerWindowID; diff --git a/toolkit/content/browser-child.js b/toolkit/content/browser-child.js index a05a3ee4a49a..cebc8569df3f 100644 --- a/toolkit/content/browser-child.js +++ b/toolkit/content/browser-child.js @@ -28,5 +28,5 @@ addEventListener("ImageContentLoaded", function(aEvent) { // We may not get any responses to Browser:Init if the browser element // is torn down too quickly. -var outerWindowID = content.windowUtils.outerWindowID; +var outerWindowID = docShell.outerWindowID; sendAsyncMessage("Browser:Init", {outerWindowID}); diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml index 5d34e2244093..213c8b55c1f6 100644 --- a/toolkit/content/widgets/browser.xml +++ b/toolkit/content/widgets/browser.xml @@ -460,7 +460,7 @@ if (this.isRemoteBrowser) { return this._outerWindowID; } - return this.contentWindow.windowUtils.outerWindowID; + return this.docShell.outerWindowID; ]]>