Bug 934001 - ImageView's setImageBitmap() is worse. r=mfinkle, a=lsblakk
authorSriram Ramasubramanian <sriram@mozilla.com>
Fri, 01 Nov 2013 15:56:41 -0700
changeset 167699 10ecc8f4258ec36e24f502c6e8897a7149cb9398
parent 167698 f1dbbbab272482e528db3ebe0b0186380a3dcad1
child 167700 ecfaa4a0cd8d4c64e87f4d7766a98d6d01198fee
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle, lsblakk
bugs934001
milestone27.0
Bug 934001 - ImageView's setImageBitmap() is worse. r=mfinkle, a=lsblakk
mobile/android/base/BrowserToolbar.java
mobile/android/base/widget/FaviconView.java
--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -1170,17 +1170,17 @@ public class BrowserToolbar extends Geck
         }
 
         mLastFavicon = image;     // Cache the original so we can debounce without scaling.
 
         if (image != null) {
             image = Bitmap.createScaledBitmap(image, mFaviconSize, mFaviconSize, false);
             mFavicon.setImageBitmap(image);
         } else {
-            mFavicon.setImageBitmap(null);
+            mFavicon.setImageDrawable(null);
         }
     }
 
     private void setSecurityMode(String mode) {
         int imageLevel = SiteIdentityPopup.getSecurityImageLevel(mode);
         mSiteSecurity.setImageLevel(imageLevel);
         mShowSiteSecurity = (imageLevel != SiteIdentityPopup.LEVEL_UKNOWN);
 
--- a/mobile/android/base/widget/FaviconView.java
+++ b/mobile/android/base/widget/FaviconView.java
@@ -194,17 +194,17 @@ public class FaviconView extends ImageVi
     }
 
     public void showDefaultFavicon() {
         setImageResource(R.drawable.favicon);
         mDominantColor = 0;
     }
 
     private void showNoImage() {
-        setImageBitmap(null);
+        setImageDrawable(null);
         mDominantColor = 0;
     }
 
     /**
      * Clear image and background shown by this view.
      */
     public void clearImage() {
         showNoImage();