Refactor setIcon to allow for more general use of imageData

extensions/renderer/resources/set_icon.js

 // Copyright 2014 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.
 
 var SetIconCommon = requireNative('setIcon').SetIconCommon;
 var sendRequest = require('sendRequest').sendRequest;
 
 function loadImagePath(path, iconSize, actionType, callback) {
   var img = new Image();
   img.onerror = function() {
@@ skipping 31 matching lines @@
   }
 
   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) {
+function setIcon(details, actionType, callback) {

[not at google - send to devlin, 2014/08/19 00:04:43]

It looks like the only reason we need to thread through |actionType| is to have
a nicer error message. Let's just forget about that nicer error message (it's
pretty clear from the context - you only have one or the other) - and delete it.
Simpler everywhere.

[gpdavis, 2014/08/19 00:54:15]

Done.

   var iconSizes = [19, 38];
   if ('iconIndex' in details) {
-    sendRequest(name, [details, callback], parameters);
+    callback(details);

[not at google - send to devlin, 2014/08/19 00:04:43]

This code is such a nightmare. Sheesh. Such a nest of braces :(

Let's fix it, starting here:

if ('iconIndex' in details) {
  callback(details);
  return;
}

if ('imageData' in details) {
  var isEmpty = true;
  for (var i = 0; i < iconSizes.length; i++) {
    var sizeKey = iconSizes[i].toString();
    if (sizeKey in details.imageData) {
      verifyImageData(..);
      isEmpty = false;
    }
  }

  if (isEmpty) {
    // If details.imageData isnot a dictionary with keys...
    var...;
    verifyImageData(..);
  }

  callback(SetIconCommon(details));
  return;
}

... etc.

[gpdavis, 2014/08/19 00:54:15]

Done.

   } else if ('imageData' in details) {
     if (typeof details.imageData == 'object') {

[not at google - send to devlin, 2014/08/19 00:04:43]

Checks like these are so unnecessary, it's exactly what the schema validation
will have sorted out.

[gpdavis, 2014/08/19 00:54:15]

Done.

       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 (!isEmpty) {
-        sendRequest(name, [details, callback], parameters,
-                    {nativeFunction: SetIconCommon});
+        callback(SetIconCommon(details));
       } 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,
-                    {nativeFunction: SetIconCommon});
+        callback(SetIconCommon(details));
      }
     } else {
       throw new Error('imageData property has unexpected type.');
     }
   } else if ('path' in details) {
     if (typeof details.path == 'object') {
       details.imageData = {};
       var isEmpty = true;
       var processIconSize = function(index) {
         if (index == iconSizes.length) {
           delete details.path;
           if (isEmpty)
             throw new Error('The path property must not be empty.');
-          sendRequest(name, [details, callback], parameters,
-                      {nativeFunction: SetIconCommon});
-          return;
+          callback(SetIconCommon(details));
         }
         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);
           });
       }
 
       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,
-                        {nativeFunction: SetIconCommon});
+            callback(SetIconCommon(details));
       });
     } else {
       throw new Error('The path property should contain either string or ' +
                       'dictionary of strings.');
     }
   } else {
     throw new Error(
         'Either the path or imageData property must be specified.');
   }
 }
 
 exports.setIcon = setIcon;