corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JAEGER] Merge from fatval branch.

Browse Source
This commit is contained in:
David Anderson
2010-06-08 17:49:46 -07:00
parent d2188e086c 2ad8d09bbc
commit 4fed5e8109
5 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/jsapi.cpp
View File

@@ -2647,8 +2647,6 @@ JS_PUBLIC_API(JSBool)
JS_SetParent(JSContext *cx, JSObject *obj, JSObject *parent)
{
CHECK_REQUEST(cx);
JS_ASSERT((!parent || !parent->isFunction()) &&
"Functions may not be set as the parents of objects.");
return js_SetProtoOrParent(cx, obj, JSSLOT_PARENT, parent, JS_FALSE);
}
@@ -2675,7 +2673,6 @@ JS_GetConstructor(JSContext *cx, JSObject *proto)
JS_PUBLIC_API(JSBool)
JS_GetObjectId(JSContext *cx, JSObject *obj, jsid *idp)
{
JS_ASSERT(JSID_IS_OBJECT((jsid)obj));
*idp = OBJECT_TO_JSID(obj);
return JS_TRUE;
}
@@ -3035,7 +3032,7 @@ LookupResult(JSContext *cx, JSObject *obj, JSObject *obj2, jsid id,
/* Peek at the native property's slot value, without doing a Get. */
if (SPROP_HAS_VALID_SLOT(sprop, obj2->scope()))
*vp = obj->lockedGetSlot(sprop->slot);
*vp = obj2->lockedGetSlot(sprop->slot);
else
vp->setBoolean(true);
} else if (obj2->isDenseArray()) {