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

Bug 1125930 - Rename TypeObject to ObjectGroup, r=jandem.

Browse Source
This commit is contained in:
Brian Hackett
2015-02-02 11:20:38 -07:00
parent 1c78e4b225
commit 34240c11e3
128 changed files with 2519 additions and 2570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
js/src/jsiter.cpp
View File

@@ -483,8 +483,9 @@ static inline PropertyIteratorObject *
NewPropertyIteratorObject(JSContext *cx, unsigned flags)
{
if (flags & JSITER_ENUMERATE) {
RootedTypeObject type(cx, cx->getNewType(&PropertyIteratorObject::class_, TaggedProto(nullptr)));
if (!type)
RootedObjectGroup group(cx, cx->getNewGroup(&PropertyIteratorObject::class_,
TaggedProto(nullptr)));
if (!group)
return nullptr;
JSObject *metadata = nullptr;
@@ -498,7 +499,7 @@ NewPropertyIteratorObject(JSContext *cx, unsigned flags)
return nullptr;
JSObject *obj = JSObject::create(cx, ITERATOR_FINALIZE_KIND,
GetInitialHeap(GenericObject, clasp), shape, type);
GetInitialHeap(GenericObject, clasp), shape, group);
if (!obj)
return nullptr;
PropertyIteratorObject *res = &obj->as<PropertyIteratorObject>();
@@ -577,9 +578,9 @@ VectorToKeyIterator(JSContext *cx, HandleObject obj, unsigned flags, AutoIdVecto
{
MOZ_ASSERT(!(flags & JSITER_FOREACH));
if (obj->hasSingletonType() && !obj->setIteratedSingleton(cx))
if (obj->isSingleton() && !obj->setIteratedSingleton(cx))
return false;
types::MarkTypeObjectFlags(cx, obj, types::OBJECT_FLAG_ITERATED);
types::MarkObjectGroupFlags(cx, obj, types::OBJECT_FLAG_ITERATED);
Rooted<PropertyIteratorObject *> iterobj(cx, NewPropertyIteratorObject(cx, flags));
if (!iterobj)
@@ -620,9 +621,9 @@ VectorToValueIterator(JSContext *cx, HandleObject obj, unsigned flags, AutoIdVec
{
MOZ_ASSERT(flags & JSITER_FOREACH);
if (obj->hasSingletonType() && !obj->setIteratedSingleton(cx))
if (obj->isSingleton() && !obj->setIteratedSingleton(cx))
return false;
types::MarkTypeObjectFlags(cx, obj, types::OBJECT_FLAG_ITERATED);
types::MarkObjectGroupFlags(cx, obj, types::OBJECT_FLAG_ITERATED);
Rooted<PropertyIteratorObject*> iterobj(cx, NewPropertyIteratorObject(cx, flags));
if (!iterobj)