Improve implementation of isInstanceOf in JSONSchemaValidator.

chrome/renderer/resources/extensions/json_schema.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.
 
 // -----------------------------------------------------------------------------
 // NOTE: If you change this file you need to touch renderer_resources.grd to
 // have your change take effect.
 // -----------------------------------------------------------------------------
 
 //==============================================================================
@@ skipping 262 matching lines @@
         this.validate(instance[prop], schema.properties[prop], propPath);
       } else if (!schema.properties[prop].optional) {
         this.addError(propPath, "propertyRequired");
       }
     }
   }
 
   // If "instanceof" property is set, check that this object inherits from
   // the specified constructor (function).
   if (schema.isInstanceOf) {
-    var isInstance = function() {
-      var constructor = this[schema.isInstanceOf];
-      if (constructor) {
-        return (instance instanceof constructor);
-      }
-
-      // Special-case constructors that can not always be found on the global
-      // object, but for which we to allow validation.
-      var allowedNamedConstructors = {
-        "Window": true,
-        "ImageData": true
-      }
-      if (!allowedNamedConstructors[schema.isInstanceOf]) {
-        throw "Attempt to validate against an instance ctor that could not be" +
-              "found: " + schema.isInstanceOf;
-      }
-      return (schema.isInstanceOf == instance.constructor.name)
-    }();
-
-    if (!isInstance)
+    if (Object.prototype.toString.call(instance) !=

[arv (Not doing code reviews), 2012/03/05 19:13:07]

Maybe we should have walked the prototype chain so that we could have used
Window in the API. Using "global" seems ugly.

function isInstanceOfClass(object , className) {
  if (!object)
    return false;
  if (Object.prototype.toString.call(instance) === "[object " + className + "]")
    return true;
  return isInstanceOfClass(Object.getPrototypeOf(object), className);
}

[Aaron Boodman, 2012/03/05 21:06:08]

I agree the recursive search is cooler, but in this case, I actually think that
documenting the return type is "global" is more correct than "Window".

I'll send a review for the recursive search, but will leave the docs the same.

+        "[object " + schema.isInstanceOf + "]") {
       this.addError(propPath, "notInstance", [schema.isInstanceOf]);
+    }
   }
 
   // Exit early from additional property check if "type":"any" is defined.
   if (schema.additionalProperties &&
       schema.additionalProperties.type &&
       schema.additionalProperties.type == "any") {
     return;
   }
 
   // By default, additional properties are not allowed on instance objects. This
@@ skipping 130 matching lines @@
  */
 chromeHidden.JSONSchemaValidator.prototype.addError = function(
     path, key, replacements) {
   this.errors.push({
     path: path,
     message: chromeHidden.JSONSchemaValidator.formatError(key, replacements)
   });
 };
 
 })();