Bug 590549 - Favicon missing from items in History tab within AwesomeScreen [r=mfinkle]

mobile/chrome/content/bindings/browser.xml

@@ -102,8 +102,15 @@
             case "pageshow":
               this.onPageShow(aMessage);
 
-              if (this.mIconURL == "" && this._documentURI)
-                this.mIconURL = this.documentURI.prePath + "/favicon.ico";
+              if (this.mIconURL == "" && this._documentURI) {
+                // Use documentURIObject in the favicon construction so that we
+                // do the right thing with about:-style error pages.  Bug 515188
+                let iconURI = Services.io.newURI(this.documentURI.prePath + "/favicon.ico", null, null);
+                if (!iconURI.schemeIs("javascript") && !gFaviconService.isFailedFavicon(iconURI)) {
+                  gFaviconService.setAndLoadFaviconForPage(this.currentURI, iconURI, true);
+                  this.mIconURL = iconURI.spec;
+                }
+              }
               break;
 
             case "pagehide":

mobile/themes/core/browser.css

@@ -767,6 +767,7 @@ placeitem > .bookmark-manage > image {
   -moz-margin-start: 8px;
 }
 
+.autocomplete-item-label > image[src=""],
 placeitem[src=""] .bookmark-item-label > image {
   list-style-image: url(chrome://mozapps/skin/places/defaultFavicon.png);
 }