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

Bug 572577 - Convert proxy name-enumerating APIs to fill in vectors of names, rather than return JSIdArrays. r=gal

Browse Source
This commit is contained in:
Jeff Walden
2010-06-16 16:11:13 -07:00
parent f99f798e94
commit 6375add981
7 changed files with 78 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
js/src/jsiter.cpp
View File

@@ -274,17 +274,16 @@ Snapshot(JSContext *cx, JSObject *obj, uintN flags, AutoValueVector &props)
return false;
} else {
if (pobj->isProxy()) {
JSIdArray *ida;
AutoValueVector proxyProps(cx);
if (flags & JSITER_OWNONLY) {
if (!JSProxy::enumerateOwn(cx, pobj, &ida))
if (!JSProxy::enumerateOwn(cx, pobj, proxyProps))
return false;
} else {
if (!JSProxy::enumerate(cx, pobj, &ida))
if (!JSProxy::enumerate(cx, pobj, proxyProps))
return false;
}
AutoIdArray idar(cx, ida);
for (size_t n = 0; n < size_t(ida->length); ++n) {
if (!Enumerate(cx, obj, pobj, ida->vector[n], true, flags, ht, props))
for (size_t n = 0, len = proxyProps.length(); n < len; n++) {
if (!Enumerate(cx, obj, pobj, (jsid) proxyProps[n], true, flags, ht, props))
return false;
}
/* Proxy objects enumerate the prototype on their own, so we are done here. */
@@ -334,11 +333,9 @@ VectorToIdArray(JSContext *cx, AutoValueVector &props, JSIdArray **idap)
}
bool
GetPropertyNames(JSContext *cx, JSObject *obj, uintN flags, JSIdArray **idap)
GetPropertyNames(JSContext *cx, JSObject *obj, uintN flags, AutoValueVector &props)
{
AutoValueVector props(cx);
return Snapshot(cx, obj, flags & (JSITER_OWNONLY | JSITER_HIDDEN), props) &&
VectorToIdArray(cx, props, idap);
return Snapshot(cx, obj, flags & (JSITER_OWNONLY | JSITER_HIDDEN), props);
}
static inline bool
@@ -409,7 +406,7 @@ RegisterEnumerator(JSContext *cx, JSObject *iterobj, NativeIterator *ni)
}
bool
JSIdArrayToIterator(JSContext *cx, JSObject *obj, uintN flags, JSIdArray *ida, jsval *vp)
IdVectorToIterator(JSContext *cx, JSObject *obj, uintN flags, AutoValueVector &props, jsval *vp)
{
JSObject *iterobj = NewIteratorObject(cx, flags);
if (!iterobj)
@@ -418,7 +415,7 @@ JSIdArrayToIterator(JSContext *cx, JSObject *obj, uintN flags, JSIdArray *ida, j
*vp = OBJECT_TO_JSVAL(iterobj);
NativeIterator *ni = NativeIterator::allocate(cx, obj, flags, NULL, 0, 0,
ida->vector, ida->length);
props.begin(), props.length());
if (!ni)
return false;