diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 38f48f16a7e..8c703bc00fd 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -2292,7 +2292,7 @@ function SetPageProxyState(aState) gLastValidURLStr = gURLBar.value; gURLBar.addEventListener("input", UpdatePageProxyState, false); - PageProxySetIcon(gBrowser.selectedBrowser.mIconURL); + PageProxySetIcon(gBrowser.getIcon()); } else if (aState == "invalid") { gURLBar.removeEventListener("input", UpdatePageProxyState, false); PageProxyClearIcon(); @@ -3913,9 +3913,9 @@ var XULBrowserWindow = { } }, - onLinkIconAvailable: function (aBrowser) { + onLinkIconAvailable: function (aBrowser, aIconURL) { if (gProxyFavIcon && gBrowser.userTypedValue === null) - PageProxySetIcon(aBrowser.mIconURL); // update the favicon in the URL bar + PageProxySetIcon(aIconURL); // update the favicon in the URL bar }, onProgressChange: function (aWebProgress, aRequest, @@ -3980,7 +3980,7 @@ var XULBrowserWindow = { if (aWebProgress.DOMWindow == content) { if (aRequest) this.endDocumentLoad(aRequest, aStatus); - if (!gBrowser.mTabbedMode && !gBrowser.selectedBrowser.mIconURL) + if (!gBrowser.mTabbedMode && !gBrowser.getIcon()) gBrowser.useDefaultIcon(gBrowser.selectedTab); } } diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 829cad6a64e..56bde7a8a91 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -700,7 +700,7 @@ let p = this.mProgressListeners[i]; if ('onLinkIconAvailable' in p) try { - p.onLinkIconAvailable(browser); + p.onLinkIconAvailable(browser, browser.mIconURL); } catch (e) { // don't inhibit other listeners Components.utils.reportError(e); @@ -712,7 +712,7 @@ let p = this.mTabsProgressListeners[i]; if ('onLinkIconAvailable' in p) try { - p.onLinkIconAvailable(browser); + p.onLinkIconAvailable(browser, browser.mIconURL); } catch (e) { // don't inhibit other listeners Components.utils.reportError(e); @@ -722,6 +722,16 @@ + + + + + + + diff --git a/browser/base/content/test/browser_bug477014.js b/browser/base/content/test/browser_bug477014.js index 47840eb67f6..5e49a10ecf6 100644 --- a/browser/base/content/test/browser_bug477014.js +++ b/browser/base/content/test/browser_bug477014.js @@ -76,7 +76,7 @@ function test() { } is(newWindow.gBrowser.selectedTab.hasAttribute("busy"), true); - is(newWindow.gBrowser.selectedTab.linkedBrowser.mIconURL,iconURLSpec); + is(newWindow.gBrowser.getIcon(), iconURLSpec); newWindow.close(); finish(); } diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_viewsource.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_viewsource.js index c84a79b047e..313bf9ee306 100644 --- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_viewsource.js +++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_viewsource.js @@ -102,7 +102,6 @@ function test() { onSecurityChange: function() {}, onStatusChange: function() {}, onRefreshAttempted: function() {}, - onLinkIconAvailable: function() {}, onStateChange: function(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) { if (aStateFlags & (Ci.nsIWebProgressListener.STATE_STOP | Ci.nsIWebProgressListener.STATE_IS_WINDOW)) { diff --git a/browser/components/wintaskbar/WindowsPreviewPerTab.jsm b/browser/components/wintaskbar/WindowsPreviewPerTab.jsm index c16c3b8dd0f..8bab231eace 100644 --- a/browser/components/wintaskbar/WindowsPreviewPerTab.jsm +++ b/browser/components/wintaskbar/WindowsPreviewPerTab.jsm @@ -517,9 +517,9 @@ TabWindow.prototype = { }, onStatusChange: function () { }, - onLinkIconAvailable: function (aBrowser) { + onLinkIconAvailable: function (aBrowser, aIconURL) { let self = this; - getFaviconAsImage(aBrowser.mIconURL, function (img) { + getFaviconAsImage(aIconURL, function (img) { let index = self.tabbrowser.browsers.indexOf(aBrowser); // Only add it if we've found the index. The tab could have closed! if (index != -1) diff --git a/extensions/reporter/resources/content/reporter/reporterOverlay.js b/extensions/reporter/resources/content/reporter/reporterOverlay.js index 697e523558c..124b10ed83d 100644 --- a/extensions/reporter/resources/content/reporter/reporterOverlay.js +++ b/extensions/reporter/resources/content/reporter/reporterOverlay.js @@ -68,7 +68,6 @@ var reporterListener = { onProgressChange: function() { }, onStatusChange: function() { }, onSecurityChange: function() { }, - onLinkIconAvailable: function() { }, onProgressChange64: function() { }, onRefreshAttempted: function() { return true; } } diff --git a/toolkit/components/viewsource/content/viewSourceUtils.js b/toolkit/components/viewsource/content/viewSourceUtils.js index dccf5385da8..00fd567129a 100644 --- a/toolkit/components/viewsource/content/viewSourceUtils.js +++ b/toolkit/components/viewsource/content/viewSourceUtils.js @@ -290,7 +290,6 @@ var gViewSourceUtils = { onProgressChange: function() {return 0;}, onStatusChange: function() {return 0;}, onSecurityChange: function() {return 0;}, - onLinkIconAvailable: function() {return 0;}, webShell: null, editor: null, diff --git a/toolkit/crashreporter/content/crashes.js b/toolkit/crashreporter/content/crashes.js index 7e9213cc426..d4a2922446d 100644 --- a/toolkit/crashreporter/content/crashes.js +++ b/toolkit/crashreporter/content/crashes.js @@ -220,7 +220,6 @@ function submitForm(iframe, dump, extra, link) onProgressChange: function() {return 0;}, onStatusChange: function() {return 0;}, onSecurityChange: function() {return 0;}, - onLinkIconAvailable: function() {return 0;} }; iframe.docShell.QueryInterface(Ci.nsIWebProgress); iframe.docShell.addProgressListener(myListener, Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT);