Update browserAction.setIcon and pageAction.setIcon for hidpi

chrome/renderer/resources/extensions/set_icon.js

Index: chrome/renderer/resources/extensions/set_icon.js
diff --git a/chrome/renderer/resources/extensions/set_icon.js b/chrome/renderer/resources/extensions/set_icon.js
index f9f2371fe83befca510a118e9c564b343203a2a5..9f9833b50384ea85896cf42109822943ae9a5083 100644
--- a/chrome/renderer/resources/extensions/set_icon.js
+++ b/chrome/renderer/resources/extensions/set_icon.js
@@ -5,57 +5,124 @@
 var SetIconCommon = requireNative('setIcon').SetIconCommon;
 var sendRequest = require('sendRequest').sendRequest;
 
+function loadImagePath(path, iconSize, actionType, callback) {
+  var img = new Image();
+  img.onerror = function() {
+    console.error('Could not load ' + actionType + ' icon \'' +
+                  path + '\'.');
+  };
+  img.onload = function() {
+    var canvas = document.createElement('canvas');
+    canvas.width = img.width > iconSize ? iconSize : img.width;
+    canvas.height = img.height > iconSize ? iconSize : img.height;
+
+    var canvas_context = canvas.getContext('2d');
+    canvas_context.clearRect(0, 0, canvas.width, canvas.height);
+    canvas_context.drawImage(img, 0, 0, canvas.width, canvas.height);
+    var imageData = canvas_context.getImageData(0, 0, canvas.width,
+                                                canvas.height);
+    callback(imageData);
+  };
+  img.src = path;
+}
+
+function verifyImageData(imageData, iconSize) {
+  // Verify that this at least looks like an ImageData element.
+  // Unfortunately, we cannot use instanceof because the ImageData
+  // constructor is not public.
+  //
+  // We do this manually instead of using JSONSchema to avoid having these
+  // properties show up in the doc.
+  if (!('width' in imageData) ||
+      !('height' in imageData) ||
+      !('data' in imageData)) {
+    throw new Error(
+        'The imageData property must contain an ImageData object.');
+  }
+
+  if (imageData.width > iconSize ||
+      imageData.height > iconSize) {
+    throw new Error(
+        'The imageData property must contain an ImageData object that ' +
+        'is no larger than ' + iconSize + ' pixels square.');
+  }
+}
+
 function setIcon(details, callback, name, parameters, actionType) {
-  var iconSize = 19;
-  if ("iconIndex" in details) {
+  var iconSizes = [19, 38];
+  if ('iconIndex' in details) {
     sendRequest(name, [details, callback], parameters);
-  } else if ("imageData" in details) {
-    // Verify that this at least looks like an ImageData element.
-    // Unfortunately, we cannot use instanceof because the ImageData
-    // constructor is not public.
-    //
-    // We do this manually instead of using JSONSchema to avoid having these
-    // properties show up in the doc.
-    if (!("width" in details.imageData) ||
-        !("height" in details.imageData) ||
-        !("data" in details.imageData)) {
-      throw new Error(
-          "The imageData property must contain an ImageData object.");
-    }
+  } else if ('imageData' in details) {
+    if (typeof details.imageData == 'object') {
+      var isEmpty = true;
+      for (var i = 0; i < iconSizes.length; i++) {
+        var sizeKey = iconSizes[i].toString();
+        if (sizeKey in details.imageData) {
+          verifyImageData(details.imageData[sizeKey], iconSizes[i]);
+          isEmpty =false;
+        }
+      }
 
-    if (details.imageData.width > iconSize ||
-        details.imageData.height > iconSize) {
-      throw new Error(
-          "The imageData property must contain an ImageData object that " +
-          "is no larger than " + iconSize + " pixels square.");
+      if (!isEmpty) {
+        sendRequest(name, [details, callback], parameters,
+                    {noStringify: true, nativeFunction: SetIconCommon});
+      } else {
+        // If details.imageData is not dictionary with keys in set {'19', '38'},
+        // it must be an ImageData object.
+        var sizeKey = iconSizes[0].toString();
+        var imageData = details.imageData;
+        details.imageData = {};
+        details.imageData[sizeKey] = imageData;
+        verifyImageData(details.imageData[sizeKey], iconSizes[0]);
+        sendRequest(name, [details, callback], parameters,
+                    {noStringify: true, nativeFunction: SetIconCommon});
+     }
+    } else {
+      throw new Error('imageData property has unexpected type.');
     }
+  } else if ('path' in details) {
+    if (typeof details.path == 'object') {
+      details.imageData = {};
+      var isEmpty = true;
+      function processIconSize(index) {
+        if (index == iconSizes.length) {
+          delete details.path;
+          if (isEmpty)
+            throw new Error('path property must not be empty.');
+          sendRequest(name, [details, callback], parameters,
+                      {noStringify: true, nativeFunction: SetIconCommon});
+          return;
+        }
+        var sizeKey = iconSizes[index].toString();
+        if (!(sizeKey in details.path)) {
+          processIconSize(index + 1);
+          return;
+        }
+        isEmpty = false;
+        loadImagePath(details.path[sizeKey], iconSizes[index], actionType,
+          function(imageData) {
+            details.imageData[sizeKey] = imageData;
+            processIconSize(index + 1);
+          });
+      }
 
-    sendRequest(name, [details, callback], parameters,
-                {noStringify: true, nativeFunction: SetIconCommon});
-  } else if ("path" in details) {
-    var img = new Image();
-    img.onerror = function() {
-      console.error("Could not load " + actionType + " icon '" +
-                    details.path + "'.");
-    };
-    img.onload = function() {
-      var canvas = document.createElement("canvas");
-      canvas.width = img.width > iconSize ? iconSize : img.width;
-      canvas.height = img.height > iconSize ? iconSize : img.height;
-
-      var canvas_context = canvas.getContext('2d');
-      canvas_context.clearRect(0, 0, canvas.width, canvas.height);
-      canvas_context.drawImage(img, 0, 0, canvas.width, canvas.height);
-      delete details.path;
-      details.imageData = canvas_context.getImageData(0, 0, canvas.width,
-                                                      canvas.height);
-      sendRequest(name, [details, callback], parameters,
-                  {noStringify: true, nativeFunction: SetIconCommon});
-    };
-    img.src = details.path;
+      processIconSize(0);
+    } else if (typeof details.path == 'string') {
+      var sizeKey = iconSizes[0].toString();
+      details.imageData = {};
+      loadImagePath(details.path, iconSizes[0], actionType,
+          function(imageData) {
+            details.imageData[sizeKey] = imageData;
+            delete details.path;
+            sendRequest(name, [details, callback], parameters,
+                        {noStringify: true, nativeFunction: SetIconCommon});
+      });
+    } else {
+      throw new Error('path property should be either string or object.');
+    }
   } else {
     throw new Error(
-        "Either the path or imageData property must be specified.");
+        'Either the path or imageData property must be specified.');
   }
 }