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

Bug 867426 - Remove RawObject typedef; r=jonco

Browse Source
This commit is contained in:
Terrence Cole
2013-04-30 15:41:12 -07:00
parent f892dcb61f
commit 2c87cd700d
64 changed files with 291 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
js/src/jsiter.cpp
View File

@@ -77,7 +77,7 @@ NewKeyValuePair(JSContext *cx, jsid id, const Value &val, MutableHandleValue rva
Value vec[2] = { IdToValue(id), val };
AutoArrayRooter tvr(cx, ArrayLength(vec), vec);
RawObject aobj = NewDenseCopiedArray(cx, 2, vec);
JSObject *aobj = NewDenseCopiedArray(cx, 2, vec);
if (!aobj)
return false;
rval.setObject(*aobj);
@@ -181,7 +181,7 @@ struct SortComparatorIds
#endif /* JS_MORE_DETERMINISTIC */
static bool
Snapshot(JSContext *cx, RawObject pobj_, unsigned flags, AutoIdVector *props)
Snapshot(JSContext *cx, JSObject *pobj_, unsigned flags, AutoIdVector *props)
{
IdSet ht(cx);
if (!ht.init(32))
@@ -378,7 +378,7 @@ NewPropertyIteratorObject(JSContext *cx, unsigned flags)
if (!shape)
return NULL;
RawObject obj = JSObject::create(cx, ITERATOR_FINALIZE_KIND,
JSObject *obj = JSObject::create(cx, ITERATOR_FINALIZE_KIND,
GetInitialHeap(GenericObject, clasp), shape, type);
if (!obj)
return NULL;
@@ -431,7 +431,7 @@ NativeIterator::allocateSentinel(JSContext *cx)
}
inline void
NativeIterator::init(RawObject obj, RawObject iterObj, unsigned flags, uint32_t slength, uint32_t key)
NativeIterator::init(JSObject *obj, JSObject *iterObj, unsigned flags, uint32_t slength, uint32_t key)
{
this->obj.init(obj);
this->iterObj_ = iterObj;
@@ -482,7 +482,7 @@ VectorToKeyIterator(JSContext *cx, HandleObject obj, unsigned flags, AutoIdVecto
* the shape key; if such a GC *does* occur, we can only get hits through
* the one-slot lastNativeIterator cache.
*/
RawObject pobj = obj;
JSObject *pobj = obj;
size_t ind = 0;
do {
ni->shapes_array[ind++] = pobj->lastProperty();
@@ -544,7 +544,7 @@ js::EnumeratedIdVectorToIterator(JSContext *cx, HandleObject obj, unsigned flags
}
static inline void
UpdateNativeIterator(NativeIterator *ni, RawObject obj)
UpdateNativeIterator(NativeIterator *ni, JSObject *obj)
{
// Update the object for which the native iterator is associated, so
// SuppressDeletedPropertyHelper will recognize the iterator as a match.
@@ -576,7 +576,7 @@ js::GetIterator(JSContext *cx, HandleObject obj, unsigned flags, MutableHandleVa
if (!Invoke(cx, ObjectOrNullValue(obj), method, 0, NULL, vp.address()))
return false;
RawObject resultObj = ToObject(cx, vp);
JSObject *resultObj = ToObject(cx, vp);
if (!resultObj)
return false;
vp.setObject(*resultObj);
@@ -590,7 +590,7 @@ js::GetIterator(JSContext *cx, HandleObject obj, unsigned flags, MutableHandleVa
if (obj) {
if (JSIteratorOp op = obj->getClass()->ext.iteratorObject) {
RawObject iterobj = op(cx, obj, !(flags & JSITER_FOREACH));
JSObject *iterobj = op(cx, obj, !(flags & JSITER_FOREACH));
if (!iterobj)
return false;
vp.setObject(*iterobj);
@@ -634,7 +634,7 @@ js::GetIterator(JSContext *cx, HandleObject obj, unsigned flags, MutableHandleVa
* currently active.
*/
{
RawObject pobj = obj;
JSObject *pobj = obj;
do {
if (!pobj->isNative() ||
!pobj->hasEmptyElements() ||
@@ -809,14 +809,14 @@ PropertyIteratorObject::sizeOfMisc(JSMallocSizeOfFun mallocSizeOf) const
}
void
PropertyIteratorObject::trace(JSTracer *trc, RawObject obj)
PropertyIteratorObject::trace(JSTracer *trc, JSObject *obj)
{
if (NativeIterator *ni = obj->asPropertyIterator().getNativeIterator())
ni->mark(trc);
}
void
PropertyIteratorObject::finalize(FreeOp *fop, RawObject obj)
PropertyIteratorObject::finalize(FreeOp *fop, JSObject *obj)
{
if (NativeIterator *ni = obj->asPropertyIterator().getNativeIterator()) {
obj->asPropertyIterator().setNativeIterator(NULL);
@@ -1034,7 +1034,7 @@ js::UnwindIteratorForException(JSContext *cx, HandleObject obj)
}
void
js::UnwindIteratorForUncatchableException(JSContext *cx, RawObject obj)
js::UnwindIteratorForUncatchableException(JSContext *cx, JSObject *obj)
{
if (obj->isPropertyIterator()) {
NativeIterator *ni = obj->asPropertyIterator().getNativeIterator();
@@ -1310,7 +1310,7 @@ Class js::StopIterationClass = {
#if JS_HAS_GENERATORS
static void
generator_finalize(FreeOp *fop, RawObject obj)
generator_finalize(FreeOp *fop, JSObject *obj)
{
JSGenerator *gen = (JSGenerator *) obj->getPrivate();
if (!gen)
@@ -1375,7 +1375,7 @@ SetGeneratorClosed(JSContext *cx, JSGenerator *gen)
}
static void
generator_trace(JSTracer *trc, RawObject obj)
generator_trace(JSTracer *trc, JSObject *obj)
{
JSGenerator *gen = (JSGenerator *) obj->getPrivate();
if (!gen)
@@ -1426,7 +1426,7 @@ js_NewGenerator(JSContext *cx)
Rooted<GlobalObject*> global(cx, &stackfp->global());
RootedObject obj(cx);
{
RawObject proto = global->getOrCreateGeneratorPrototype(cx);
JSObject *proto = global->getOrCreateGeneratorPrototype(cx);
if (!proto)
return NULL;
obj = NewObjectWithGivenProto(cx, &GeneratorClass, proto, global);