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

Rename RootedVar to Rooted, bug 756823. r=billm

Browse Source
This commit is contained in:
Brian Hackett
2012-05-24 16:05:18 -07:00
parent f4fa29d00b
commit 662da160da
84 changed files with 1187 additions and 1187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
js/src/jsiter.cpp
View File

@@ -205,7 +205,7 @@ static bool
EnumerateNativeProperties(JSContext *cx, JSObject *obj_, JSObject *pobj_, unsigned flags, IdSet &ht,
AutoIdVector *props)
{
RootedVarObject obj(cx, obj_), pobj(cx, pobj_);
RootedObject obj(cx, obj_), pobj(cx, pobj_);
size_t initialLength = props->length();
@@ -287,7 +287,7 @@ Snapshot(JSContext *cx, JSObject *obj_, unsigned flags, AutoIdVector *props)
if (!ht.init(32))
return NULL;
RootedVarObject obj(cx, obj_), pobj(cx);
RootedObject obj(cx, obj_), pobj(cx);
pobj = obj;
do {
@@ -483,12 +483,12 @@ static inline JSObject *
NewIteratorObject(JSContext *cx, unsigned flags)
{
if (flags & JSITER_ENUMERATE) {
RootedVarTypeObject type(cx);
RootedTypeObject type(cx);
type = cx->compartment->getEmptyType(cx);
if (!type)
return NULL;
RootedVarShape emptyEnumeratorShape(cx);
RootedShape emptyEnumeratorShape(cx);
emptyEnumeratorShape = EmptyShape::getInitialShape(cx, &IteratorClass, NULL, NULL,
ITERATOR_FINALIZE_KIND);
if (!emptyEnumeratorShape)
@@ -565,7 +565,7 @@ VectorToKeyIterator(JSContext *cx, HandleObject obj, unsigned flags, AutoIdVecto
types::MarkTypeObjectFlags(cx, obj, types::OBJECT_FLAG_ITERATED);
}
RootedVarObject iterobj(cx, NewIteratorObject(cx, flags));
RootedObject iterobj(cx, NewIteratorObject(cx, flags));
if (!iterobj)
return false;
@@ -819,7 +819,7 @@ iterator_next(JSContext *cx, unsigned argc, Value *vp)
CallArgs args = CallArgsFromVp(argc, vp);
bool ok;
RootedVarObject obj(cx, NonGenericMethodGuard(cx, args, iterator_next, &IteratorClass, &ok));
RootedObject obj(cx, NonGenericMethodGuard(cx, args, iterator_next, &IteratorClass, &ok));
if (!obj)
return ok;
@@ -863,7 +863,7 @@ js::ValueToIterator(JSContext *cx, unsigned flags, Value *vp)
*/
cx->iterValue.setMagic(JS_NO_ITER_VALUE);
RootedVarObject obj(cx);
RootedObject obj(cx);
if (vp->isObject()) {
/* Common case. */
obj = &vp->toObject();
@@ -923,7 +923,7 @@ js::CloseIterator(JSContext *cx, JSObject *obj)
bool
js::UnwindIteratorForException(JSContext *cx, JSObject *obj)
{
RootedVarValue v(cx, cx->getPendingException());
RootedValue v(cx, cx->getPendingException());
cx->clearPendingException();
if (!CloseIterator(cx, obj))
return false;
@@ -983,7 +983,7 @@ SuppressDeletedPropertyHelper(JSContext *cx, HandleObject obj, StringPredicate p
JSObject *proto = obj->getProto();
JSObject *obj2;
JSProperty *prop;
RootedVarId id(cx);
RootedId id(cx);
if (!ValueToId(cx, StringValue(*idp), id.address()))
return false;
if (!proto->lookupGeneric(cx, id, &obj2, &prop))
@@ -1052,7 +1052,7 @@ public:
bool
js_SuppressDeletedProperty(JSContext *cx, HandleObject obj, jsid id)
{
RootedVar<JSFlatString*> str(cx, IdToString(cx, id));
Rooted<JSFlatString*> str(cx, IdToString(cx, id));
if (!str)
return false;
return SuppressDeletedPropertyHelper(cx, obj, SingleStringPredicate(cx, str));
@@ -1122,10 +1122,10 @@ ElementIteratorObject::setIndex(uint32_t index)
bool
ElementIteratorObject::iteratorNext(JSContext *cx, Value *vp)
{
RootedVar<ElementIteratorObject*> self(cx, this);
Rooted<ElementIteratorObject*> self(cx, this);
uint32_t i, length;
RootedVarObject obj(cx, getTargetObject());
RootedObject obj(cx, getTargetObject());
if (!js_GetLengthProperty(cx, obj, &length))
goto error;
@@ -1183,7 +1183,7 @@ js_IteratorMore(JSContext *cx, HandleObject iterobj, Value *rval)
/* Fetch and cache the next value from the iterator. */
if (ni) {
JS_ASSERT(!ni->isKeyIter());
RootedVarId id(cx);
RootedId id(cx);
if (!ValueToId(cx, StringValue(*ni->current()), id.address()))
return false;
ni->incCursor();
@@ -1409,7 +1409,7 @@ js_NewGenerator(JSContext *cx)
JS_ASSERT(stackfp->base() == cx->regs().sp);
JS_ASSERT(stackfp->actualArgs() <= stackfp->formalArgs());
RootedVar<GlobalObject*> global(cx, &stackfp->global());
Rooted<GlobalObject*> global(cx, &stackfp->global());
JSObject *proto = global->getOrCreateGeneratorPrototype(cx);
if (!proto)
return NULL;
@@ -1700,7 +1700,7 @@ static JSFunctionSpec generator_methods[] = {
static bool
InitIteratorClass(JSContext *cx, Handle<GlobalObject*> global)
{
RootedVarObject iteratorProto(cx, global->createBlankPrototype(cx, &IteratorClass));
RootedObject iteratorProto(cx, global->createBlankPrototype(cx, &IteratorClass));
if (!iteratorProto)
return false;
@@ -1712,7 +1712,7 @@ InitIteratorClass(JSContext *cx, Handle<GlobalObject*> global)
iteratorProto->setNativeIterator(ni);
RootedVarFunction ctor(cx);
RootedFunction ctor(cx);
ctor = global->createConstructor(cx, Iterator, CLASS_NAME(cx, Iterator), 2);
if (!ctor)
return false;
@@ -1730,7 +1730,7 @@ InitIteratorClass(JSContext *cx, Handle<GlobalObject*> global)
GlobalObject::initGeneratorClass(JSContext *cx, Handle<GlobalObject*> global)
{
#if JS_HAS_GENERATORS
RootedVarObject proto(cx, global->createBlankPrototype(cx, &GeneratorClass));
RootedObject proto(cx, global->createBlankPrototype(cx, &GeneratorClass));
if (!proto || !DefinePropertiesAndBrand(cx, proto, NULL, generator_methods))
return false;
global->setReservedSlot(GENERATOR_PROTO, ObjectValue(*proto));
@@ -1741,7 +1741,7 @@ GlobalObject::initGeneratorClass(JSContext *cx, Handle<GlobalObject*> global)
static JSObject *
InitStopIterationClass(JSContext *cx, Handle<GlobalObject*> global)
{
RootedVarObject proto(cx, global->createBlankPrototype(cx, &StopIterationClass));
RootedObject proto(cx, global->createBlankPrototype(cx, &StopIterationClass));
if (!proto || !proto->freeze(cx))
return NULL;
@@ -1759,7 +1759,7 @@ js_InitIteratorClasses(JSContext *cx, JSObject *obj)
{
JS_ASSERT(obj->isNative());
RootedVar<GlobalObject*> global(cx, &obj->asGlobal());
Rooted<GlobalObject*> global(cx, &obj->asGlobal());
/*
* Bail if Iterator has already been initialized. We test for Iterator