Make favicons for about:history and about:bookmarks switch from lodpi to hidpi when dragging browser

chrome/browser/resources/shared/js/util.js

 // Copyright (c) 2012 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.
 
 /**
  * The global object.
  * @type {!Object}
  * @const
  */
 var global = this;
@@ skipping 20 matching lines @@
     // restore
     global[callbackName] = old;
 
     var args = Array.prototype.slice.call(arguments);
     return callback.apply(global, args);
   };
   chrome.send(name, params);
 }
 
 /**
+ * Returns the scale factors supported by this platform.
+ * @return {array} The supported scale factors.
+ */
+function getSupportedScaleFactors() {
+  var supportedScaleFactors = [];
+  if (cr.isMac || cr.isChromeOS) {
+    supportedScaleFactors.push(1);
+    supportedScaleFactors.push(2);
+  } else {
+    // Windows must be restarted to display at a different scale factor.
+    supportedScaleFactors.push(window.devicePixelRatio);
+  }
+  return supportedScaleFactors;
+}
+
+/**
  * Generates a CSS url string.
  * @param {string} s The URL to generate the CSS url for.
  * @return {string} The CSS url string.
  */
 function url(s) {
   // http://www.w3.org/TR/css3-values/#uris
   // Parentheses, commas, whitespace characters, single quotes (') and double
   // quotes (") appearing in a URI must be escaped with a backslash
   var s2 = s.replace(/(\(|\)|\,|\s|\'|\"|\\)/g, '\\$1');
   // WebKit has a bug when it comes to URLs that end with \
   // https://bugs.webkit.org/show_bug.cgi?id=28885
   if (/\\\\$/.test(s2)) {
     // Add a space to work around the WebKit bug.
     s2 += ' ';
   }
   return 'url("' + s2 + '")';
 }
 
 /**
+ * Generates a CSS -webkit-image-set for a chrome:// url.
+ * An entry in the image set is added for each of getSupportedScaleFactors().
+ * The scale-factor-specific url is generated by replacing the first instance of
+ * 'scalefactor' in |path| with the numeric scale factor.
+ * @param {string} path The URL to generate an image set for.
+ *     'scalefactor' should be a substring of |path|.
+ * @return {string} The CSS -webkit-image-set.
+ */
+function imageset(path) {
+  var supportedScaleFactors = getSupportedScaleFactors();
+
+  var replaceStartIndex = path.indexOf('scalefactor');
+  if (replaceStartIndex < 0)
+    return url(path);
+
+  var s = '';
+  for (var i = 0; i < supportedScaleFactors.length; ++i) {
+    var scaleFactor = supportedScaleFactors[i];
+    var pathWithScaleFactor = path.substr(0, replaceStartIndex) + scaleFactor +
+        path.substr(replaceStartIndex + 11);

[Evan Stade, 2013/01/04 21:43:44]

what is this magic 11? use 'scalefactor'.length

[pkotwicz, 2013/01/04 23:06:53]

Done.

+
+   s += url(pathWithScaleFactor) + ' ' + scaleFactor + 'x';

[Evan Stade, 2013/01/04 21:43:44]

indentation is wrong here

[pkotwicz, 2013/01/04 23:06:53]

Done.

+
+   if (i != supportedScaleFactors.length - 1)
+     s += ', ';
+  }
+  return '-webkit-image-set(' + s + ')';
+}
+
+/**
  * Parses query parameters from Location.
  * @param {string} location The URL to generate the CSS url for.
  * @return {object} Dictionary containing name value pairs for URL
  */
 function parseQueryParams(location) {
   var params = {};
   var query = unescape(location.search.substring(1));
   var vars = query.split('&');
   for (var i = 0; i < vars.length; i++) {
     var pair = vars[i].split('=');
@@ skipping 151 matching lines @@
  */
 function appendParam(url, key, value) {
   var param = encodeURIComponent(key) + '=' + encodeURIComponent(value);
 
   if (url.indexOf('?') == -1)
     return url + '?' + param;
   return url + '&' + param;
 }
 
 /**
- * Creates a new URL for a favicon request.
+ * Creates a CSS -webkit-image-set for a favicon request.
+ * @param {string} url The url for the favicon.
+ * @param {number=} opt_size Optional preferred size of the favicon.
+ * @param {boolean=} opt_sessionFavicon Optional flag to indicate if
+ *     requesting a session favicon.
+ * @return {string} -webkit-image-set for the favicon.
+ */
+function getFaviconImageSet(url, opt_size, opt_sessionFavicon) {
+  var size = opt_size || 16;
+  var type = opt_sessionFavicon ? 'session-favicon' : 'favicon';
+  return imageset(
+      'chrome://' + type + '/size/' + size + '@scalefactorx/' + url);
+}
+
+/**
+ * Creates a new URL for a request of the 1x favicon.
  * @param {string} url The url for the favicon.
  * @param {number=} opt_size Optional preferred size of the favicon.
  * @param {boolean=} opt_sessionFavicon Optional flag to indicate if
  *     requesting a session favicon.
  * @return {string} Updated URL for the favicon.
  */
-function getFaviconUrl(url, opt_size, opt_sessionFavicon) {
+function get1xFaviconUrl(url, opt_size, opt_sessionFavicon) {

[Evan Stade, 2013/01/04 21:43:44]

not a fan of this function name. Can you call it Unscaled, or some other English
word, instead of 1x?

[pkotwicz, 2013/01/04 23:06:53]

Renamed to getFaviconUrlForDevicePixelRatio().
Didn't use getUnscaleFaviconUrl() as a favicon for the 2x scale factor is not
scaled either.

Added a comment warning about the limitations of the function

   var size = opt_size || 16;
   var type = opt_sessionFavicon ? 'session-favicon' : 'favicon';
-  return 'chrome://' + type + '/size/' + size + '@' +
-      window.devicePixelRatio + 'x/' + url;
+  return 'chrome://' + type + '/size/' + size + '@1x/' + url;
 }
 
 /**
  * Creates an element of a specified type with a specified class name.
  * @param {string} type The node type.
  * @param {string} className The class name to use.
  * @return {Element} The created element.
  */
 function createElementWithClassName(type, className) {
   var elm = document.createElement(type);
   elm.className = className;
   return elm;
 }