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

bug 362910 - js_GetMethod cleanup. r=brendan

Browse Source
This commit is contained in:
Igor Bukanov
2009-03-14 17:41:47 +01:00
parent 9a6e04e9e3
commit 70838353dd
9 changed files with 102 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
js/src/jsobj.cpp
View File

@@ -4322,6 +4322,22 @@ js_GetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
return js_GetPropertyHelper(cx, obj, id, vp, NULL);
}
JSBool
js_GetMethod(JSContext *cx, JSObject *obj, jsid id, jsval *vp,
JSPropCacheEntry **entryp)
{
if (obj->map->ops == &js_ObjectOps ||
obj->map->ops->getProperty == js_GetProperty) {
return js_GetPropertyHelper(cx, obj, id, vp, entryp);
}
JS_ASSERT_IF(entryp, OBJ_IS_DENSE_ARRAY(cx, obj));
#if JS_HAS_XML_SUPPORT
if (OBJECT_IS_XML(cx, obj))
return js_GetXMLMethod(cx, obj, id, vp);
#endif
return OBJ_GET_PROPERTY(cx, obj, id, vp);
}
JSBool
js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, jsval *vp,
JSPropCacheEntry **entryp)
@@ -5438,18 +5454,7 @@ js_TryMethod(JSContext *cx, JSObject *obj, JSAtom *atom,
older = JS_SetErrorReporter(cx, NULL);
id = ATOM_TO_JSID(atom);
fval = JSVAL_VOID;
#if JS_HAS_XML_SUPPORT
if (OBJECT_IS_XML(cx, obj)) {
JSXMLObjectOps *ops;
ops = (JSXMLObjectOps *) obj->map->ops;
obj = ops->getMethod(cx, obj, id, &fval);
ok = (obj != NULL);
} else
#endif
{
ok = OBJ_GET_PROPERTY(cx, obj, id, &fval);
}
ok = js_GetMethod(cx, obj, id, &fval, NULL);
if (!ok)
JS_ClearPendingException(cx);
JS_SetErrorReporter(cx, older);