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

Merge from mozilla-central.

Browse Source
This commit is contained in:
David Anderson
2012-02-21 15:08:22 -08:00
parent 243e68f291 3147f31b9e
commit 4c9cc22c1f
504 changed files with 14101 additions and 7332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/jsiter.cpp
View File

@@ -76,6 +76,7 @@
#include "jsinferinlines.h"
#include "jsobjinlines.h"
#include "vm/MethodGuard-inl.h"
#include "vm/Stack-inl.h"
#include "vm/String-inl.h"
@@ -89,7 +90,7 @@ static JSObject *iterator_iterator(JSContext *cx, JSObject *obj, JSBool keysonly
Class js::IteratorClass = {
"Iterator",
JSCLASS_HAS_PRIVATE |
JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS |
JSCLASS_HAS_CACHED_PROTO(JSProto_Iterator),
JS_PropertyStub, /* addProperty */
JS_PropertyStub, /* delProperty */
@@ -148,9 +149,9 @@ void
NativeIterator::mark(JSTracer *trc)
{
for (HeapPtr<JSFlatString> *str = begin(); str < end(); str++)
MarkString(trc, *str, "prop");
MarkString(trc, str, "prop");
if (obj)
MarkObject(trc, obj, "obj");
MarkObject(trc, &obj, "obj");
}
static void
@@ -1428,7 +1429,7 @@ generator_trace(JSTracer *trc, JSObject *obj)
Class js::GeneratorClass = {
"Generator",
JSCLASS_HAS_PRIVATE,
JSCLASS_HAS_PRIVATE | JSCLASS_IMPLEMENTS_BARRIERS,
JS_PropertyStub, /* addProperty */
JS_PropertyStub, /* delProperty */
JS_PropertyStub, /* getProperty */