From 3f06242a486a162189adcffd42648abe3680cfc0 Mon Sep 17 00:00:00 2001 From: abdelrhman Date: Sun, 21 Dec 2014 01:11:58 +0100 Subject: [PATCH] Bug 1113096 - Low quality favicons in new search preferences, r=florian. --- browser/components/preferences/in-content/search.js | 13 +++++++++---- browser/components/preferences/search.js | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/browser/components/preferences/in-content/search.js b/browser/components/preferences/in-content/search.js index d200acf183d7..bba23ad1bdb7 100644 --- a/browser/components/preferences/in-content/search.js +++ b/browser/components/preferences/in-content/search.js @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); +Components.utils.import("resource://gre/modules/PlacesUtils.jsm"); const ENGINE_FLAVOR = "text/x-moz-search-engine"; @@ -52,8 +53,10 @@ var gSearchPane = { gEngineView._engineStore._engines.forEach(e => { let item = list.appendItem(e.name); item.setAttribute("class", "menuitem-iconic searchengine-menuitem menuitem-with-favicon"); - if (e.iconURI) - item.setAttribute("image", e.iconURI.spec); + if (e.iconURI) { + let uri = PlacesUtils.getImageURLForResolution(window, e.iconURI.spec); + item.setAttribute("image", uri); + } item.engine = e; if (e.name == currentEngine) list.selectedItem = item; @@ -362,8 +365,10 @@ EngineView.prototype = { }, getImageSrc: function(index, column) { - if (column.id == "engineName" && this._engineStore.engines[index].iconURI) - return this._engineStore.engines[index].iconURI.spec; + if (column.id == "engineName" && this._engineStore.engines[index].iconURI) { + let uri = this._engineStore.engines[index].iconURI.spec; + return PlacesUtils.getImageURLForResolution(window, uri); + } return ""; }, diff --git a/browser/components/preferences/search.js b/browser/components/preferences/search.js index 194265523489..78275ac7de23 100644 --- a/browser/components/preferences/search.js +++ b/browser/components/preferences/search.js @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); +Components.utils.import("resource://gre/modules/PlacesUtils.jsm"); const ENGINE_FLAVOR = "text/x-moz-search-engine"; @@ -45,8 +46,10 @@ var gSearchPane = { gEngineView._engineStore._engines.forEach(e => { let item = list.appendItem(e.name); item.setAttribute("class", "menuitem-iconic searchengine-menuitem menuitem-with-favicon"); - if (e.iconURI) - item.setAttribute("image", e.iconURI.spec); + if (e.iconURI) { + let uri = PlacesUtils.getImageURLForResolution(window, e.iconURI.spec); + item.setAttribute("image", uri); + } item.engine = e; if (e.name == currentEngine) list.selectedItem = item; @@ -433,8 +436,10 @@ EngineView.prototype = { }, getImageSrc: function(index, column) { - if (column.id == "engineName" && this._engineStore.engines[index].iconURI) - return this._engineStore.engines[index].iconURI.spec; + if (column.id == "engineName" && this._engineStore.engines[index].iconURI) { + let uri = this._engineStore.engines[index].iconURI.spec; + return PlacesUtils.getImageURLForResolution(window, uri); + } return ""; },