Bug 463270: fix favicon code to avoid trying to load a favicon for wyciwyg:...

Bug 463270: fix favicon code to avoid trying to load a favicon for wyciwyg: pages (fixes ASSERTION: Must have a principal: 'mOwner'), r=gavin --HG-- extra : rebase_source : 67d63f88c4ed980508c15ef1afcde94155e9171d

Bug 463270: fix favicon code to avoid trying to load a favicon for wyciwyg:...
27862f43 · David Dahl · 164332ae · 27862f43
Commit 27862f43 authored 15 years ago by David Dahl
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -692,6 +692,7 @@
        <body>
          <![CDATA[
            var browser = this.getBrowserForTab(aTab);
+            var docURIObject = browser.contentDocument.documentURIObject; 
            if (browser.contentDocument instanceof ImageDocument) {
              if (this.mPrefs.getBoolPref("browser.chrome.site_icons")) {
                try {
@@ -711,8 +712,8 @@
            }
            // Use documentURIObject in the check for shouldLoadFavIcon so that we
            // do the right thing with about:-style error pages.  Bug 453442
-            else if (this.shouldLoadFavIcon(browser.contentDocument.documentURIObject)) {
-              var url = browser.currentURI.prePath + "/favicon.ico";
+            else if (this.shouldLoadFavIcon(docURIObject)) {
+              var url = docURIObject.prePath + "/favicon.ico";
              if (!this.isFailedIcon(url))
                this.setIcon(aTab, url);
            }