Changeset 15482 in webkit for trunk/JavaScriptCore/kjs/internal.cpp

Timestamp:

Jul 17, 2006, 1:20:28 AM (19 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

• Changed JSObjectMakeConstructor to JSObjectMakeConstructorWithCallback, to match JSObjectMakeFunctionWithCallback.

• Added prototype parameter, so the generated constructor automatically works with hasInstance / instanceof

• Moved hasInstance implementation from InternalFunctionImp to JSObject so that subclasses can inherit it without inheriting function-related baggage. More refactoring here would be good, but this seems like a good short-term solution.

(KJS::JSCallbackFunction::implementsHasInstance): override and return false,
because callback functions aren't constructors.

File:

• trunk/JavaScriptCore/kjs/internal.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/internal.cpp

@@ -217 +217 @@
 }
 
-bool InternalFunctionImp::hasInstance(ExecState *exec, JSValue *value)
-{
-  if (!value->isObject())
-    return false;
-
-  JSValue *prot = get(exec,prototypePropertyName);
-  if (!prot->isObject() && !prot->isNull()) {
-    throwError(exec, TypeError, "Invalid prototype encountered in instanceof operation.");
-    return false;
-  }
-
-  JSObject *v = static_cast<JSObject *>(value);
-  while ((v = v->prototype()->getObject())) {
-    if (v == prot)
-      return true;
-  }
-  return false;
-}
-
 // ------------------------------ global functions -----------------------------