Changeset 11650 in webkit for trunk/JavaScriptCore/kjs/object_object.cpp

Timestamp:

Dec 18, 2005, 5:27:00 AM (19 years ago)

Author:

andersca

Message:

2005-12-18 Anders Carlsson <​[email protected]>

Reviewed by Darin and Geoffrey.

• fix for <​http://bugzilla.opendarwin.org/show_bug.cgi?id=4000> Object.prototype is missing isPrototypeOf

• kjs/object_object.cpp: (ObjectPrototype::ObjectPrototype): Add isPrototypeOf to object prototype.

(ObjectProtoFunc::callAsFunction):
Implement isPrototypeOf

• kjs/object_object.h: (KJS::ObjectProtoFunc::): Add id for isPrototypeOf.

File:

• trunk/JavaScriptCore/kjs/object_object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/object_object.cpp

@@ -44 +44 @@
     putDirect("hasOwnProperty", new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::HasOwnProperty,             1), DontEnum);
     putDirect("propertyIsEnumerable", new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::PropertyIsEnumerable, 1), DontEnum);
+    putDirect("isPrototypeOf", new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::IsPrototypeOf,               1), DontEnum);
     // Mozilla extensions
     putDirect("__defineGetter__", new ObjectProtoFunc(exec, funcProto, ObjectProtoFunc::DefineGetter,             2), DontEnum);
@@ -78 +79 @@
             PropertySlot slot;
             return jsBoolean(thisObj->getOwnPropertySlot(exec, Identifier(args[0]->toString(exec)), slot));
+        }
+        case IsPrototypeOf: {
+            if (!args[0]->isObject())
+                return jsBoolean(false);
+         
+            JSValue *v = static_cast<JSObject *>(args[0])->prototype();
+
+            while (true) {
+                if (!v->isObject())
+                    return jsBoolean(false);
+                
+                if (thisObj == static_cast<JSObject *>(v))
+
+                    return jsBoolean(true);
+                
+                v = static_cast<JSObject *>(v)->prototype();
+            }
         }
         case DefineGetter: