[Android] Fix NTP bookmark image unit for low resolution device.

chrome/browser/resources/ntp_android/ntp_android.js

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // File Description:
 //     Contains all the necessary functions for rendering the NTP on mobile
 //     devices.
 
 /**
  * The event type used to determine when a touch starts.
@@ skipping 689 matching lines @@
       var iconUrl = item.icon || 'chrome://touch-icon/largest/' + item.url;
       var faviconIcon = createDiv('favicon-icon');
       faviconIcon.style.backgroundImage = 'url(' + iconUrl + ')';
       trackImageLoad(iconUrl);
 
       var image = new Image();
       image.src = iconUrl;
       image.onload = function() {
         var w = image.width;
         var h = image.height;
-        var wDip = w / window.devicePixelRatio;
-        var hDip = h / window.devicePixelRatio;
-        if (Math.floor(wDip) <= 16 || Math.floor(hDip) <= 16) {
+        if (Math.floor(w) <= 16 || Math.floor(h) <= 16) {
           // it's a standard favicon (or at least it's small).
           faviconBox.classList.add('document');
 
           faviconBox.appendChild(
               createDiv('color-strip colorstrip-' + faviconIndex));
           faviconBox.appendChild(createDiv('bookmark-border'));
           var foldDiv = createDiv('fold');
           foldDiv.id = 'fold_' + faviconIndex;
           foldDiv.style['background'] =
               '-webkit-canvas(fold_' + faviconIndex + ')';
@@ skipping 10 matching lines @@
           // the dominant color for all scale factors is the same.
           chrome.send('getFaviconDominantColor',
               [('chrome://favicon/size/16@1x/' + item.url), '' + faviconIndex]);
           faviconIndex++;
         } else if ((w == 57 && h == 57) || (w == 114 && h == 114)) {
           // it's a touch icon for 1x or 2x.
           faviconIcon.classList.add('touch-icon');
         } else {
           // It's an html5 icon (or at least it's larger).
           // Rescale it to be no bigger than 64x64 dip.
-          var maxDip = 64; // DIP
-          if (wDip > maxDip || hDip > maxDip) {
-            var scale = (wDip > hDip) ? (maxDip / wDip) : (maxDip / hDip);
-            wDip *= scale;
-            hDip *= scale;
+          var max = 64;
+          if (w > max || h > max) {
+            var scale = (w > h) ? (max / w) : (max / h);
+            w *= scale;
+            h *= scale;
           }
-          faviconIcon.style.backgroundSize = wDip + 'px ' + hDip + 'px';
+          faviconIcon.style.backgroundSize = w + 'px ' + h + 'px';
         }
       };
       faviconBox.appendChild(faviconIcon);
     }
     holder.appendChild(faviconBox);
 
     var title = createDiv('title');
     title.textContent = item.title;
     holder.appendChild(title);
 
@@ skipping 1447 matching lines @@
     var labelLeft = (thumbWidth - labelWidth) / 2;
     var itemHeight = thumbHeight + labelHeight;
 
     // default vertical margin between items
     var itemMarginTop = 0;
     var itemMarginBottom = 0;
     var itemMarginLeft = 20;
     var itemMarginRight = 20;
 
     var listHeight = 0;
-    // set it to the unscaled size so centerGrid works correctly
-    modifyCssRule('body[device="phone"] .thumbnail-cell',
-        'width', thumbWidth + 'px');
 
     var screenHeight =
         document.documentElement.offsetHeight -
         getButtonBarPadding();
 
     if (isPortrait()) {
       mostVisitedList.setAttribute(GRID_COLUMNS, '2');
-      listHeight = screenHeight * .85;
-      listHeight = listHeight >= 420 ? 420 : listHeight;
+      listHeight = screenHeight;
+      listHeight = listHeight >= 400 ? 400 : listHeight;
       // Size for 3 rows (4 gutters)
       itemMarginTop = (listHeight - (itemHeight * 3)) / 4;
     } else {
       mostVisitedList.setAttribute(GRID_COLUMNS, '3');
       listHeight = screenHeight;
 
       // If the screen height is less than targetHeight, scale the size of the
       // thumbnails such that the margin between the thumbnails remains
       // constant.
       var targetHeight = 220;
       if (screenHeight < targetHeight) {
         var targetRemainder = targetHeight - 2 * (thumbHeight + labelHeight);
         var scale = (screenHeight - 2 * labelHeight -
             targetRemainder) / (2 * thumbHeight);
         // update values based on scale
-        thumbWidth *= scale;
-        thumbHeight *= scale;
+        thumbWidth = Math.round(thumbWidth * scale);
+        thumbHeight = Math.round(thumbHeight * scale);
         labelWidth = thumbWidth + 20;
         itemHeight = thumbHeight + labelHeight;
       }
 
       // scale the vertical margin such that the items fit perfectly on the
       // screen
       var remainder = screenHeight - (2 * itemHeight);
       var margin = (remainder / 2);
       margin = margin > 24 ? 24 : margin;
       itemMarginTop = Math.round(margin / 2);
@@ skipping 431 matching lines @@
 // NTP Entry point.
 /////////////////////////////////////////////////////////////////////////////
 
 /*
  * Handles initializing the UI when the page has finished loading.
  */
 window.addEventListener('DOMContentLoaded', function(evt) {
   ntp.init();
   $('content-area').style.display = 'block';
 });