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

Merge TM -> JM

Browse Source
This commit is contained in:
Brian Hackett
2011-05-09 09:49:48 -07:00
parent 51a192bc88 785a5978a8
commit 34017f15b0
967 changed files with 15871 additions and 19401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/jsiter.cpp
View File

@@ -224,9 +224,9 @@ EnumerateNativeProperties(JSContext *cx, JSObject *obj, JSObject *pobj, uintN fl
for (Shape::Range r = pobj->lastProperty()->all(); !r.empty(); r.popFront()) {
const Shape &shape = r.front();
if (!JSID_IS_DEFAULT_XML_NAMESPACE(shape.id) &&
if (!JSID_IS_DEFAULT_XML_NAMESPACE(shape.propid) &&
!shape.isAlias() &&
!Enumerate(cx, obj, pobj, shape.id, shape.enumerable(),
!Enumerate(cx, obj, pobj, shape.propid, shape.enumerable(),
shape.isSharedPermanent(), flags, ht, props))
{
return false;
@@ -1489,12 +1489,11 @@ js_InitIteratorClasses(JSContext *cx, JSObject *obj)
}
#endif
MarkStandardClassInitializedNoProto(obj, &js_StopIterationClass);
proto = js_InitClass(cx, obj, NULL, &js_StopIterationClass, NULL, 0, NULL,
NULL, NULL, NULL, NULL);
if (!proto)
return NULL;
cx->addTypeProperty(obj->getType(), js_StopIteration_str, ObjectValue(*proto));
if (proto)
cx->addTypeProperty(obj->getType(), js_StopIteration_str, ObjectValue(*proto));
return proto;
}