gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

SpiderMonkey 38 removes JS_NewPropertyIterator, use JS_Enumerate instead.

Browse Source 
https://bugzilla.mozilla.org/show_bug.cgi?id=1081660

This was SVN commit r17510.
This commit is contained in:
leper
2015-12-19 02:21:22 +00:00
parent e80e37cb21
commit 190f9176df
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scriptinterface/ScriptInterface.cpp
+5 -7
View File
@@ -767,19 +767,17 @@ bool ScriptInterface::EnumeratePropertyNamesWithPrefix(JS::HandleValue objVal, c
return true; // reached the end of the prototype chain
JS::RootedObject obj(m->m_cx, &objVal.toObject());
JS::RootedObject it(m->m_cx, JS_NewPropertyIterator(m->m_cx, obj));
if (!it)
JS::AutoIdArray props(m->m_cx, JS_Enumerate(m->m_cx, obj));
if (!props)
return false;
while (true)
for (size_t i = 0; i < props.length(); ++i)
{
JS::RootedId idp(m->m_cx);
JS::RootedId id(m->m_cx, props[i]);
JS::RootedValue val(m->m_cx);
if (! JS_NextProperty(m->m_cx, it, idp.address()) || ! JS_IdToValue(m->m_cx, idp, &val))
if (!JS_IdToValue(m->m_cx, id, &val))
return false;
if (val.isUndefined())
break; // end of iteration
if (!val.isString())
continue; // ignore integer properties