Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 21:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 918917 - Show no favicon until load fails, then show default favicon, or the result (r=margaret)

Browse Source
This commit is contained in:
Chris Kitching 2013-09-27 12:12:22 +01:00
parent 5bdb4dd4bd
commit 7fc29f20ec
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mobile/android/base/widget/FaviconView.java
View File

@ -62,17 +62,9 @@ public class FaviconView extends ImageView {
* in this view with the coloured background.
*/
private void formatImage() {
// If we're called before bitmap is set, just show the default.
if (mIconBitmap == null) {
setImageResource(R.drawable.favicon);
hideBackground();
return;
}
// If we're called before size set, abort.
if (mActualWidth == 0 || mActualHeight == 0) {
hideBackground();
setImageResource(R.drawable.favicon);
// If we're called before bitmap is set, or before size is set, show blank.
if (mIconBitmap == null || mActualWidth == 0 || mActualHeight == 0) {
clearImage();
return;
}
@ -142,6 +134,11 @@ public class FaviconView extends ImageView {
* (Favicons class), so as to exploit caching.
*/
private void updateImageInternal(Bitmap bitmap, String key, boolean allowScaling) {
if (bitmap == null) {
showDefaultFavicon();
return;
}
// Reassigning the same bitmap? Don't bother.
if (mUnscaledBitmap == bitmap) {
return;
@ -155,12 +152,21 @@ public class FaviconView extends ImageView {
formatImage();
}
private void showDefaultFavicon() {
setImageResource(R.drawable.favicon);
hideBackground();
}
/**
* Clear image and background shown by this view.
*/
public void clearImage() {
setImageResource(0);
hideBackground();
mUnscaledBitmap = null;
mIconBitmap = null;
mIconKey = null;
mScalingExpected = false;
}
/**