Changeset 15482 in webkit for trunk/JavaScriptCore/kjs/object.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/object.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/object.cpp

@@ -445 +445 @@
 }
 
-bool JSObject::hasInstance(ExecState *, JSValue *)
-{
-  assert(false);
-  return false;
+bool JSObject::hasInstance(ExecState* exec, JSValue* value)
+{
+    JSValue* proto = get(exec, prototypePropertyName);
+    if (!proto->isObject()) {
+        throwError(exec, TypeError, "intanceof called on an object with an invalid prototype property.");
+        return false;
+    }
+    
+    if (!value->isObject())
+        return false;
+    
+    JSObject* o = static_cast<JSObject*>(value);
+    while ((o = o->prototype()->getObject())) {
+        if (o == proto)
+            return true;
+    }
+    return false;
 }