Bug 1113096 - Low quality favicons in new search preferences, r=florian.

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)
+      if (e.iconURI) {
-        item.setAttribute("image", e.iconURI.spec);
+        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)
+    if (column.id == "engineName" && this._engineStore.engines[index].iconURI) {
-      return this._engineStore.engines[index].iconURI.spec;
+      let uri = this._engineStore.engines[index].iconURI.spec;
+      return PlacesUtils.getImageURLForResolution(window, uri);
+    }
     return "";
   },
 

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)
+      if (e.iconURI) {
-        item.setAttribute("image", e.iconURI.spec);
+        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)
+    if (column.id == "engineName" && this._engineStore.engines[index].iconURI) {
-      return this._engineStore.engines[index].iconURI.spec;
+      let uri = this._engineStore.engines[index].iconURI.spec;
+      return PlacesUtils.getImageURLForResolution(window, uri);
+    }
     return "";
   },