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

Bug 466781 - TM: inconsistent (0 in d) where d is a String. r=brendan

Browse Source
This commit is contained in:
Robert Sayre
2009-01-09 00:59:24 -05:00
parent 1b237da2b0
commit 2769ba709d
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
js/src/jsbuiltins.cpp
View File

@@ -398,13 +398,15 @@ js_AddProperty(JSContext* cx, JSObject* obj, JSScopeProperty* sprop)
return JS_FALSE;
}
JSBool FASTCALL
js_HasNamedProperty(JSContext* cx, JSObject* obj, JSString* idstr)
static JSBool
HasProperty(JSContext* cx, JSObject* obj, jsid id)
{
jsid id;
if (!js_ValueToStringId(cx, STRING_TO_JSVAL(idstr), &id))
// check whether we know how the resolve op will behave
JSClass* clasp = OBJ_GET_CLASS(cx, obj);
if (clasp->resolve != JS_ResolveStub && clasp != &js_StringClass)
return JSVAL_TO_BOOLEAN(JSVAL_VOID);
JSAutoResolveFlags rf(cx, JSRESOLVE_QUALIFIED);
JSObject* obj2;
JSProperty* prop;
if (!OBJ_LOOKUP_PROPERTY(cx, obj, id, &obj2, &prop))
@@ -414,6 +416,16 @@ js_HasNamedProperty(JSContext* cx, JSObject* obj, JSString* idstr)
return prop != NULL;
}
JSBool FASTCALL
js_HasNamedProperty(JSContext* cx, JSObject* obj, JSString* idstr)
{
jsid id;
if (!js_ValueToStringId(cx, STRING_TO_JSVAL(idstr), &id))
return JSVAL_TO_BOOLEAN(JSVAL_VOID);
return HasProperty(cx, obj, id);
}
JSBool FASTCALL
js_HasNamedPropertyInt32(JSContext* cx, JSObject* obj, int32 index)
{
@@ -421,13 +433,7 @@ js_HasNamedPropertyInt32(JSContext* cx, JSObject* obj, int32 index)
if (!js_Int32ToId(cx, index, &id))
return JSVAL_TO_BOOLEAN(JSVAL_VOID);
JSObject* obj2;
JSProperty* prop;
if (!OBJ_LOOKUP_PROPERTY(cx, obj, id, &obj2, &prop))
return JSVAL_TO_BOOLEAN(JSVAL_VOID);
if (prop)
OBJ_DROP_PROPERTY(cx, obj2, prop);
return prop != NULL;
return HasProperty(cx, obj, id);
}
jsval FASTCALL