wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out changeset 6571e0aef937 (bug 788275) because of test failures

Browse Source
This commit is contained in:
Ehsan Akhgari 2012-09-17 16:08:13 -04:00
parent e7d0a7be7c
commit a769d695f2
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
browser/modules/WindowsPreviewPerTab.jsm
View File

@ -72,14 +72,8 @@ XPCOMUtils.defineLazyServiceGetter(this, "faviconSvc",
"nsIFaviconService"); "nsIFaviconService");
// nsIURI -> imgIContainer // nsIURI -> imgIContainer
function _imageFromURI(uri, privateMode, callback) { function _imageFromURI(uri, callback) {
let channel = ioSvc.newChannelFromURI(uri); let channel = ioSvc.newChannelFromURI(uri);
try {
channel.QueryInterface(Ci.nsIPrivateBrowsingChannel);
channel.setPrivate(privateMode);
} catch (e) {
// Ignore channels which do not support nsIPrivateBrowsingChannel
}
NetUtil.asyncFetch(channel, function(inputStream, resultCode) { NetUtil.asyncFetch(channel, function(inputStream, resultCode) {
if (!Components.isSuccessCode(resultCode)) if (!Components.isSuccessCode(resultCode))
return; return;
@ -98,11 +92,11 @@ function _imageFromURI(uri, privateMode, callback) {
} }
// string? -> imgIContainer // string? -> imgIContainer
function getFaviconAsImage(iconurl, privateMode, callback) { function getFaviconAsImage(iconurl, callback) {
if (iconurl) if (iconurl)
_imageFromURI(NetUtil.newURI(iconurl), privateMode, callback); _imageFromURI(NetUtil.newURI(iconurl), callback);
else else
_imageFromURI(faviconSvc.defaultFavicon, privateMode, callback); _imageFromURI(faviconSvc.defaultFavicon, callback);
} }
// Snaps the given rectangle to be pixel-aligned at the given scale // Snaps the given rectangle to be pixel-aligned at the given scale
@ -442,7 +436,7 @@ TabWindow.prototype = {
preview.visible = AeroPeek.enabled; preview.visible = AeroPeek.enabled;
preview.active = this.tabbrowser.selectedTab == tab; preview.active = this.tabbrowser.selectedTab == tab;
// Grab the default favicon // Grab the default favicon
getFaviconAsImage(null, this.win.gPrivateBrowsingUI.privateWindow, function (img) { getFaviconAsImage(null, function (img) {
// It is possible that we've already gotten the real favicon, so make sure // It is possible that we've already gotten the real favicon, so make sure
// we have not set one before setting this default one. // we have not set one before setting this default one.
if (!preview.icon) if (!preview.icon)
@ -541,7 +535,7 @@ TabWindow.prototype = {
//// Browser progress listener //// Browser progress listener
onLinkIconAvailable: function (aBrowser, aIconURL) { onLinkIconAvailable: function (aBrowser, aIconURL) {
let self = this; let self = this;
getFaviconAsImage(aIconURL, this.win.gPrivateBrowsingUI.privateWindow, function (img) { getFaviconAsImage(aIconURL, function (img) {
let index = self.tabbrowser.browsers.indexOf(aBrowser); let index = self.tabbrowser.browsers.indexOf(aBrowser);
// Only add it if we've found the index. The tab could have closed! // Only add it if we've found the index. The tab could have closed!
if (index != -1) if (index != -1)