From 27862f43cd310019e36108df5f0e4da686b02114 Mon Sep 17 00:00:00 2001
From: David Dahl <ddahl@mozilla.com>
Date: Tue, 22 Sep 2009 14:13:58 -0400
Subject: [PATCH] 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
---
browser/base/content/tabbrowser.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index df6f4946a0d53..569061ef886f3 100644
--- 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);
}
--
GitLab