Bug 1158282 - Correct showDefaultFavicon comment. r=me
authorMichael Comella <michael.l.comella@gmail.com>
Fri, 22 May 2015 11:35:45 -0700
changeset 266271 02d343f01fa55053e21e36191c279f19ebbdb486
parent 266270 8d1f3331f453f65b2b234a1ecc9d556b0c4ce275
child 266272 bcd15b22f748ee862279a52a7f91260ba3795d6d
child 266273 d37db5866da8eb46c4beabee61518783a5cb1666
child 267323 143cb1b455fa0155c81177f9f61a2de1a5caee06
child 268089 237c36c7501082644396b83d4523e178aff8b8cd
push id2231
push usermichael.l.comella@gmail.com
push dateFri, 22 May 2015 20:04:59 +0000
reviewersme
bugs1158282
milestone41.0a1
Bug 1158282 - Correct showDefaultFavicon comment. r=me I thought the dominant color box was always used, but it is only used when it is enabled in XML attrs.
mobile/android/base/widget/FaviconView.java
--- a/mobile/android/base/widget/FaviconView.java
+++ b/mobile/android/base/widget/FaviconView.java
@@ -213,19 +213,18 @@ public class FaviconView extends ImageVi
         mScalingExpected = allowScaling;
 
         // Possibly update the display.
         formatImage();
     }
 
     public void showDefaultFavicon() {
         // We handle the default favicon as any other favicon to avoid the complications of special
-        // casing it. This means that if we provide assets that require the default favicon to be
-        // scaled up to fit in the container, a box with the dominant color will be used. We can
-        // deal with that later if it becomes relevant.
+        // casing it. This means that the icon can be scaled both up and down, and the dominant
+        // color box can used if it is enabled in XML attrs.
         final Bitmap defaultFaviconBitmap = BitmapFactory.decodeResource(getResources(),
                 R.drawable.favicon_globe);
         updateAndScaleImage(defaultFaviconBitmap, DEFAULT_FAVICON_KEY);
     }
 
     private void showNoImage() {
         setImageDrawable(null);
         mDominantColor = 0;