Bug 715258 - Favicons are of low quality for local/internal pages r=mfinkle
authorWesley Johnston <wjohnston@mozilla.com>
Thu, 13 Dec 2012 23:32:25 -0500
changeset 125200 6fb67e58bad6f0f7d04be11729ad1d52e1ad48ae
parent 125199 df953ce7ba31c69badd52392360906ae6884c21d
child 125201 aafa9e2de5325478e00064bfe4908eb5bbd65352
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs715258
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 715258 - Favicons are of low quality for local/internal pages r=mfinkle
mobile/android/base/GeckoJarReader.java
mobile/android/base/Makefile.in
mobile/android/base/db/BrowserProvider.java.in
mobile/android/base/strings.xml.in
mobile/android/branding/aurora/android-resources.mn
mobile/android/branding/aurora/content/bookmarkdefaults_favicon_aboutfirefox.png
mobile/android/branding/aurora/content/favicon32.png
mobile/android/branding/aurora/content/favicon64.png
mobile/android/branding/aurora/content/jar.mn
mobile/android/branding/beta/android-resources.mn
mobile/android/branding/beta/content/bookmarkdefaults_favicon_aboutfirefox.png
mobile/android/branding/beta/content/favicon64.png
mobile/android/branding/beta/content/jar.mn
mobile/android/branding/nightly/android-resources.mn
mobile/android/branding/nightly/content/bookmarkdefaults_favicon_aboutfirefox.png
mobile/android/branding/nightly/content/favicon64.png
mobile/android/branding/nightly/content/jar.mn
mobile/android/branding/official/android-resources.mn
mobile/android/branding/official/content/bookmarkdefaults_favicon_aboutfirefox.png
mobile/android/branding/official/content/favicon64.png
mobile/android/branding/official/content/jar.mn
mobile/android/branding/unofficial/android-resources.mn
mobile/android/branding/unofficial/content/bookmarkdefaults_favicon_aboutfirefox.png
mobile/android/branding/unofficial/content/favicon64.png
mobile/android/branding/unofficial/content/fennec_72x72.png
mobile/android/branding/unofficial/content/jar.mn
mobile/android/chrome/content/about.xhtml
mobile/android/chrome/content/aboutAddons.xhtml
mobile/android/chrome/content/aboutApps.xhtml
mobile/android/chrome/content/aboutCertError.xhtml
mobile/android/chrome/content/aboutDownloads.xhtml
mobile/android/chrome/content/aboutFeedback.xhtml
mobile/android/chrome/content/aboutHome.xhtml
mobile/android/chrome/content/blockedSite.xhtml
mobile/android/chrome/content/netError.xhtml
--- a/mobile/android/base/GeckoJarReader.java
+++ b/mobile/android/base/GeckoJarReader.java
@@ -113,29 +113,29 @@ public final class GeckoJarReader {
                 String fileName = jarUrls.pop();
 
                 if (inputStream != null) {
                     entry = getEntryFromStream(inputStream, fileName);
                 } else {
                     entry = zip.getEntry(fileName);
                 }
 
+                if (entry == null) {
+                    Log.d(LOGTAG, "No Entry for " + fileName);
+                    return null;
+                }
+
                 // if there is nothing else on the stack, this will throw and break us out of the loop
                 jarUrls.peek();
 
                 if (inputStream != null) {
                     inputStream = new ZipInputStream(inputStream);
                 } else {
                     inputStream = new ZipInputStream(zip.getInputStream(entry));
                 }
-  
-                if (entry == null) {
-                    Log.d(LOGTAG, "No Entry for " + fileName);
-                    return null;
-                }
             }
         } catch (EmptyStackException ex) {
             Log.d(LOGTAG, "Jar reader reached end of stack");
         }
         return inputStream;
     }
 
     /* Searches through a ZipInputStream for an entry with a given name */
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -568,18 +568,16 @@ RES_DRAWABLE_BASE = \
   res/drawable/site_security_identified.png \
   res/drawable/site_security_verified.png \
   res/drawable/urlbar_stop.png \
   res/drawable/reader.png \
   res/drawable/reading_list.png \
   res/drawable/validation_arrow.png \
   res/drawable/validation_arrow_inverted.png \
   res/drawable/validation_bg.9.png \
-  res/drawable/bookmarkdefaults_favicon_support.png \
-  res/drawable/bookmarkdefaults_favicon_addons.png \
   res/drawable/handle_end.png \
   res/drawable/handle_middle.png \
   res/drawable/handle_start.png \
   $(addprefix res/drawable-mdpi/,$(notdir $(SYNC_RES_DRAWABLE_MDPI))) \
   $(NULL)
 
 RES_DRAWABLE_LDPI = \
   $(addprefix res/drawable-ldpi/,$(notdir $(SYNC_RES_DRAWABLE_LDPI))) \
--- a/mobile/android/base/db/BrowserProvider.java.in
+++ b/mobile/android/base/db/BrowserProvider.java.in
@@ -36,16 +36,17 @@ import org.mozilla.gecko.db.BrowserContr
 import org.mozilla.gecko.db.BrowserContract.Thumbnails;
 import org.mozilla.gecko.db.BrowserContract.URLColumns;
 import org.mozilla.gecko.db.BrowserContract;
 import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.db.DBUtils;
 import org.mozilla.gecko.ProfileMigrator;
 import org.mozilla.gecko.sync.Utils;
 import org.mozilla.gecko.util.GeckoBackgroundThread;
+import org.mozilla.gecko.util.GeckoJarReader;
 
 import android.app.SearchManager;
 import android.content.ContentProvider;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.ContentProviderResult;
 import android.content.ContentProviderOperation;
 import android.content.OperationApplicationException;
@@ -55,16 +56,17 @@ import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.database.MatrixCursor;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.graphics.BitmapFactory;
 import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 
 public class BrowserProvider extends ContentProvider {
     private static final String LOGTAG = "GeckoBrowserProvider";
     private Context mContext;
@@ -1013,41 +1015,82 @@ public class BrowserProvider extends Con
                     Log.e(LOGTAG, "Can't create bookmark " + name, ex);
                 } catch (java.lang.NoSuchFieldException ex) {
                     Log.e(LOGTAG, "Can't create bookmark " + name, ex);
                 }
             }
         }
 
         private void setDefaultFavicon(SQLiteDatabase db, String name, String url) {
+            ByteArrayOutputStream stream = getDefaultFaviconFromPath(db, name, url);
+            if (stream == null) {
+              stream = getDefaultFaviconFromDrawable(db, name, url);
+            }
+            if (stream != null) {
+                ContentValues values = new ContentValues();
+                values.put(Favicons.DATA, stream.toByteArray());
+                values.put(Favicons.PAGE_URL, url);
+                insertFavicon(db, values);
+            }
+        }
+
+        private ByteArrayOutputStream getDefaultFaviconFromPath(SQLiteDatabase db, String name, String url) {
+            ByteArrayOutputStream stream = null;
+            Class stringClass = R.string.class;
+            try {
+                // Look for a drawable with the id R.drawable.bookmarkdefaults_favicon_*
+                Field faviconField = stringClass.getField(name.replace("_title_", "_favicon_"));
+                if (faviconField == null)
+                  return null;
+                int faviconId = faviconField.getInt(null);
+                String path = mContext.getString(faviconId);
+
+                String apkPath = mContext.getPackageResourcePath();
+                File apkFile = new File(apkPath);
+                BitmapDrawable bitmapDrawable = GeckoJarReader.getBitmapDrawable(mContext.getResources(),
+                                                                                 "jar:jar:" + apkFile.toURI() + "!/omni.ja!/" + path);
+                if (bitmapDrawable == null) {
+                  return null;
+                }
+                Bitmap bitmap = bitmapDrawable.getBitmap();
+                if (bitmap == null) {
+                  return null;
+                }
+                stream = new ByteArrayOutputStream();
+                bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
+            } catch (java.lang.IllegalAccessException ex) {
+                Log.e(LOGTAG, "[Path] Can't create favicon " + name, ex);
+            } catch (java.lang.NoSuchFieldException ex) {
+                // if there is no such field, create the bookmark without a favicon
+                Log.d(LOGTAG, "[Path] Can't create favicon " + name);
+            }
+            return stream;
+        }
+
+        private ByteArrayOutputStream getDefaultFaviconFromDrawable(SQLiteDatabase db, String name, String url) {
             Class<?> drawablesClass = R.drawable.class;
             ByteArrayOutputStream stream = null;
             try {
                 // Look for a drawable with the id R.drawable.bookmarkdefaults_favicon_*
                 Field faviconField = drawablesClass.getField(name.replace("_title_", "_favicon_"));
                 if (faviconField == null)
-                  return;
+                  return null;
 
                 int faviconId = faviconField.getInt(null);
                 Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), faviconId);
                 stream = new ByteArrayOutputStream();
                 bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
             } catch (java.lang.IllegalAccessException ex) {
-                Log.e(LOGTAG, "Can't create favicon " + name, ex);
+                Log.e(LOGTAG, "[Drawable] Can't create favicon " + name, ex);
             } catch (java.lang.NoSuchFieldException ex) {
                 // if there is no such field, create the bookmark without a favicon
-                Log.d(LOGTAG, "Can't create favicon " + name);
+                Log.d(LOGTAG, "[Drawable] Can't create favicon " + name);
             }
 
-            if (stream != null) {
-                ContentValues values = new ContentValues();
-                values.put(Favicons.DATA, stream.toByteArray());
-                values.put(Favicons.PAGE_URL, url);
-                insertFavicon(db, values);
-            }
+            return stream;
         }
 
         private void createOrUpdateAllSpecialFolders(SQLiteDatabase db) {
             createOrUpdateSpecialFolder(db, Bookmarks.MOBILE_FOLDER_GUID,
                 R.string.bookmarks_folder_mobile, 0);
             createOrUpdateSpecialFolder(db, Bookmarks.TOOLBAR_FOLDER_GUID,
                 R.string.bookmarks_folder_toolbar, 1);
             createOrUpdateSpecialFolder(db, Bookmarks.MENU_FOLDER_GUID,
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -204,22 +204,24 @@
   <string name="filepicker_audio_title">&filepicker_audio_title;</string>
   <string name="filepicker_image_title">&filepicker_image_title;</string>
   <string name="filepicker_video_title">&filepicker_video_title;</string>
 
   <!-- Default bookmarks. Use bookmarks titles shared with XUL from mobile's
        profile/bookmarks.inc. Don't expose the URLs to L10N. -->
   <string name="bookmarkdefaults_title_aboutfirefox">@bookmarks_aboutBrowser@</string>
   <string name="bookmarkdefaults_url_aboutfirefox">about:firefox</string>
+  <string name="bookmarkdefaults_favicon_aboutfirefox">chrome/chrome/content/branding/favicon64.png</string>
 
   <string name="bookmarkdefaults_title_addons">@bookmarks_addons@</string>
   <string name="bookmarkdefaults_url_addons">https://addons.mozilla.org/@AB_CD@/android/</string>
 
   <string name="bookmarkdefaults_title_support">@bookmarks_support@</string>
   <string name="bookmarkdefaults_url_support">http://support.mozilla.org/@AB_CD@/mobile</string>
+  <string name="bookmarkdefaults_favicon_abouthome">chrome/chrome/content/branding/favicon64.png</string>
 
   <string name="bookmarkdefaults_title_abouthome">@bookmarks_aboutHome@</string>
   <string name="bookmarkdefaults_url_abouthome">about:home</string>
 
   <!-- Site identity popup -->
   <string name="identity_connected_to">&identity_connected_to;</string>
   <string name="identity_run_by">&identity_run_by;</string>
 
--- a/mobile/android/branding/aurora/android-resources.mn
+++ b/mobile/android/branding/aurora/android-resources.mn
@@ -1,4 +1,3 @@
 mobile/android/branding/aurora/content/logo.png
 mobile/android/branding/aurora/content/favicon32.png
-mobile/android/branding/aurora/content/bookmarkdefaults_favicon_aboutfirefox.png
 mobile/android/branding/aurora/content/mdpi/widget_icon.png
deleted file mode 100644
index f515b5d337e2f8fccc52bec5700778c5ace418b1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
index f515b5d337e2f8fccc52bec5700778c5ace418b1..40421cc7948a8179b589a5538a96d0c0f5267946
GIT binary patch
literal 2580
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
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bb949ccbade829caf3df2f42c5508591c644296d
GIT binary patch
literal 7997
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
--- a/mobile/android/branding/aurora/content/jar.mn
+++ b/mobile/android/branding/aurora/content/jar.mn
@@ -3,8 +3,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 chrome.jar:
 % content branding %content/branding/
   content/branding/about.png                     (about.png)
   content/branding/logoWordmark.png              (logoWordmark.png)
   content/branding/logo.png                      (logo.png)
   content/branding/favicon32.png                 (favicon32.png)
+  content/branding/favicon64.png                 (favicon64.png)
--- a/mobile/android/branding/beta/android-resources.mn
+++ b/mobile/android/branding/beta/android-resources.mn
@@ -1,4 +1,3 @@
 mobile/android/branding/beta/content/logo.png
 mobile/android/branding/beta/content/favicon32.png
-mobile/android/branding/beta/content/bookmarkdefaults_favicon_aboutfirefox.png
 mobile/android/branding/beta/content/mdpi/widget_icon.png
deleted file mode 100644
index ac4a6968bf2746ad89a82d85df3a8679b5530cca..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..20bae0717c7ba086955fb4578d84cfe82fc77f47
GIT binary patch
literal 8244
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
--- a/mobile/android/branding/beta/content/jar.mn
+++ b/mobile/android/branding/beta/content/jar.mn
@@ -3,8 +3,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 chrome.jar:
 % content branding %content/branding/
   content/branding/about.png                     (about.png)
   content/branding/logoWordmark.png              (logoWordmark.png)
   content/branding/logo.png                      (logo.png)
   content/branding/favicon32.png                 (favicon32.png)
+  content/branding/favicon64.png                 (favicon64.png)
--- a/mobile/android/branding/nightly/android-resources.mn
+++ b/mobile/android/branding/nightly/android-resources.mn
@@ -1,4 +1,3 @@
 mobile/android/branding/nightly/content/logo.png
 mobile/android/branding/nightly/content/favicon32.png
-mobile/android/branding/nightly/content/bookmarkdefaults_favicon_aboutfirefox.png
 mobile/android/branding/nightly/content/mdpi/widget_icon.png
deleted file mode 100644
index 43ad466c6152fe70cb872cac784929be8d7d9d84..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1ac6eaf5197821b3336ff59a37c50a7cef300f8a
GIT binary patch
literal 7675
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
--- a/mobile/android/branding/nightly/content/jar.mn
+++ b/mobile/android/branding/nightly/content/jar.mn
@@ -3,8 +3,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 chrome.jar:
 % content branding %content/branding/
   content/branding/about.png                     (about.png)
   content/branding/logoWordmark.png              (logoWordmark.png)
   content/branding/logo.png                      (logo.png)
   content/branding/favicon32.png                 (favicon32.png)
+  content/branding/favicon64.png                 (favicon64.png)
--- a/mobile/android/branding/official/android-resources.mn
+++ b/mobile/android/branding/official/android-resources.mn
@@ -1,4 +1,3 @@
 mobile/android/branding/official/content/logo.png
 mobile/android/branding/official/content/favicon32.png
-mobile/android/branding/official/content/bookmarkdefaults_favicon_aboutfirefox.png
 mobile/android/branding/official/content/mdpi/widget_icon.png
deleted file mode 100644
index ac4a6968bf2746ad89a82d85df3a8679b5530cca..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..20bae0717c7ba086955fb4578d84cfe82fc77f47
GIT binary patch
literal 8244
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
--- a/mobile/android/branding/official/content/jar.mn
+++ b/mobile/android/branding/official/content/jar.mn
@@ -3,8 +3,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 chrome.jar:
 % content branding %content/branding/
   content/branding/about.png                     (about.png)
   content/branding/logoWordmark.png              (logoWordmark.png)
   content/branding/logo.png                      (logo.png)
   content/branding/favicon32.png                 (favicon32.png)
+  content/branding/favicon64.png                 (favicon64.png)
--- a/mobile/android/branding/unofficial/android-resources.mn
+++ b/mobile/android/branding/unofficial/android-resources.mn
@@ -1,4 +1,3 @@
 mobile/android/branding/unofficial/content/favicon32.png
 mobile/android/branding/unofficial/content/logo.png
-mobile/android/branding/unofficial/content/bookmarkdefaults_favicon_aboutfirefox.png
 mobile/android/branding/unofficial/content/mdpi/widget_icon.png
deleted file mode 100644
index 3f04acd50d303235149c6a2822003ed94f8a51a7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d6263c9d240366a40a4c838108b105fdd474ce13
GIT binary patch
literal 6143
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
R`m+E4002ovPDHLkV1jA#7<2#t
index c7874013f6af9174fda8b201f513ea0baaba9e00..1cdb4df2fcb711d28aa1ea982da26a8d4455d0df
GIT binary patch
literal 7161
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
--- a/mobile/android/branding/unofficial/content/jar.mn
+++ b/mobile/android/branding/unofficial/content/jar.mn
@@ -3,8 +3,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 chrome.jar:
 % content branding %content/branding/
   content/branding/about.png                     (about.png)
   content/branding/logoWordmark.png              (logoWordmark.png)
   content/branding/logo.png                      (logo.png)
   content/branding/favicon32.png                 (favicon32.png)
+  content/branding/favicon64.png                 (favicon64.png)
--- a/mobile/android/chrome/content/about.xhtml
+++ b/mobile/android/chrome/content/about.xhtml
@@ -13,17 +13,17 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=no"/>
   <title>&aboutPage.title;</title>
   <link rel="stylesheet" href="chrome://browser/skin/aboutPage.css" type="text/css"/>
-  <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
+  <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
 </head>
 
 <body dir="&locale.dir;">
   <div id="header">
     <div id="wordmark"></div>
 #expand <p id="version">__MOZ_APP_VERSION__</p>
   </div>
 
--- a/mobile/android/chrome/content/aboutAddons.xhtml
+++ b/mobile/android/chrome/content/aboutAddons.xhtml
@@ -13,17 +13,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <title>&aboutAddons.title2;</title>
   <meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=0" />
-  <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
+  <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
   <link rel="stylesheet" href="chrome://browser/skin/aboutAddons.css" type="text/css"/>
   <style>
     .hide-on-enable,
     .show-on-error,
     .show-on-uninstall,
     .show-on-install,
     .show-on-restart,
     div[isDisabled="true"] .hide-on-disable {
--- a/mobile/android/chrome/content/aboutApps.xhtml
+++ b/mobile/android/chrome/content/aboutApps.xhtml
@@ -16,17 +16,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>&aboutApps.title2;</title>
     <meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=0" />
-    <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
+    <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
     <link rel="stylesheet" type="text/css" href="chrome://browser/skin/aboutApps.css" media="all" />
     <script type="text/javascript;version=1.8" src="chrome://browser/content/aboutApps.js"></script>
   </head>
 
   <body dir="&locale.dir;" onload="onLoad(event)" onunload="onUnload(event)">
     <div class="header">
       <div>&aboutApps.header;</div>
       <img src="chrome://browser/skin/images/addons-amo-hdpi.png" class="icon" pref="app.marketplaceURL" onclick="openLink(this);"/>
--- a/mobile/android/chrome/content/aboutCertError.xhtml
+++ b/mobile/android/chrome/content/aboutCertError.xhtml
@@ -22,17 +22,17 @@
     <meta name="viewport" content="width=device-width; user-scalable=false" />
     <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
     <!-- This page currently uses the same favicon as neterror.xhtml.
          If the location of the favicon is changed for both pages, the
          FAVICON_ERRORPAGE_URL symbol in toolkit/components/places/src/nsFaviconService.h
          should be updated. If this page starts using a different favicon
          than neterrorm nsFaviconService->SetAndLoadFaviconForPage
          should be updated to ignore this one as well. -->
-    <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning-16.png"/>
+    <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://global/skin/icons/warning-64.png"/>
 
     <script type="application/javascript"><![CDATA[
       // Error url MUST be formatted like this:
       //   about:certerror?e=error&u=url&d=desc
 
       // Note that this file uses document.documentURI to get
       // the URL (with the format from above). This is because
       // document.location.href gets the current URI off the docshell,
--- a/mobile/android/chrome/content/aboutDownloads.xhtml
+++ b/mobile/android/chrome/content/aboutDownloads.xhtml
@@ -14,17 +14,17 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 <head>
   <title>&aboutDownloads.title;</title>
   <meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=0" />
-  <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
+  <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
   <link rel="stylesheet" href="chrome://browser/skin/aboutDownloads.css" type="text/css"/>
 </head>
 
 <body dir="&locale.dir;" onload="Downloads.init();" onunload="Downloads.uninit();">
   <div class="header">
     <div>&aboutDownloads.header;</div>
   </div>
   <ul id="downloads-list"></ul>
--- a/mobile/android/chrome/content/aboutFeedback.xhtml
+++ b/mobile/android/chrome/content/aboutFeedback.xhtml
@@ -14,17 +14,17 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <title>&pageTitle;</title>
   <meta name="viewport" content="width=device-width; user-scalable=0" />
   <link rel="stylesheet" href="chrome://browser/skin/aboutFeedback.css" type="text/css"/>
-  <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
+  <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
 </head>
 
 <body dir="&locale.dir;" onload="init();" onunload="uninit();">
 
   <section id="intro" active="true">
     <h1 class="header">&intro.header;</h1>
     <div class="message">&intro.message;</div>
     <div class="link-box" onclick="switchSection('happy');">
--- a/mobile/android/chrome/content/aboutHome.xhtml
+++ b/mobile/android/chrome/content/aboutHome.xhtml
@@ -4,13 +4,13 @@
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
+  <link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
 </head>
 <body>
 </body>
 </html>
--- a/mobile/android/chrome/content/blockedSite.xhtml
+++ b/mobile/android/chrome/content/blockedSite.xhtml
@@ -14,17 +14,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml" class="blacklist">
   <head>
     <meta name="viewport" content="width=device-width; user-scalable=false" />
     <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
-    <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/blacklist_favicon.png"/>
+    <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://global/skin/icons/blacklist_large.png"/>
 
     <script type="application/javascript"><![CDATA[
       // Error url MUST be formatted like this:
       //   about:blocked?e=error_code&u=url
       
       // Note that this file uses document.documentURI to get
       // the URL (with the format from above). This is because
       // document.location.href gets the current URI off the docshell,
--- a/mobile/android/chrome/content/netError.xhtml
+++ b/mobile/android/chrome/content/netError.xhtml
@@ -19,17 +19,17 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta name="viewport" content="width=device-width; user-scalable=false;" /> 
     <title>&loadError.label;</title>
     <link rel="stylesheet" href="chrome://global/skin/netError.css" type="text/css" media="all" />
     <!-- If the location of the favicon is changed here, the FAVICON_ERRORPAGE_URL symbol in
          toolkit/components/places/src/nsFaviconService.h should be updated. -->
-    <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning-16.png"/>
+    <link rel="icon" type="image/png" id="favicon" sizes="64x64" href="chrome://global/skin/icons/warning-64.png"/>
 
     <script type="application/javascript"><![CDATA[
       // Error url MUST be formatted like this:
       //   moz-neterror:page?e=error&u=url&d=desc
       //
       // or optionally, to specify an alternate CSS class to allow for
       // custom styling and favicon:
       //