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

Back out 66882ea6f8c7 (bug 788293) and 32f09cb3c7b6 (bug 834090) for bustage

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda
2013-01-31 22:29:30 -08:00
parent 8a6a6457bd
commit 6c1eebfede
96 changed files with 13074 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/jsiter.cpp
View File

@@ -30,6 +30,10 @@
#include "jsproxy.h"
#include "jsscript.h"
#if JS_HAS_XML_SUPPORT
#include "jsxml.h"
#endif
#include "builtin/ParallelArray.h"
#include "ds/Sort.h"
#include "frontend/TokenStream.h"
@@ -147,8 +151,11 @@ EnumerateNativeProperties(JSContext *cx, HandleObject pobj, unsigned flags, IdSe
for (; !r.empty(); r.popFront()) {
Shape &shape = r.front();
if (!Enumerate(cx, pobj, shape.propid(), shape.enumerable(), flags, ht, props))
if (!JSID_IS_DEFAULT_XML_NAMESPACE(shape.propid()) &&
!Enumerate(cx, pobj, shape.propid(), shape.enumerable(), flags, ht, props))
{
return false;
}
}
::Reverse(props->begin() + initialLength, props->end());
@@ -257,6 +264,10 @@ Snapshot(JSContext *cx, RawObject pobj_, unsigned flags, AutoIdVector *props)
if (flags & JSITER_OWNONLY)
break;
#if JS_HAS_XML_SUPPORT
if (pobj->isXML())
break;
#endif
} while ((pobj = pobj->getProto()) != NULL);
#ifdef JS_MORE_DETERMINISTIC