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

Bug 828248 - Part e: Pass MutableHandleId to InternNonIntElementId; r=sfink

Browse Source
This commit is contained in:
Ms2ger
2013-01-11 09:43:00 +01:00
parent e6e343a794
commit f5102fe12e
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/jsatom.cpp
View File

@@ -416,25 +416,25 @@ js::IndexToIdSlow(JSContext *cx, uint32_t index, MutableHandleId idp)
bool
js::InternNonIntElementId(JSContext *cx, JSObject *obj, const Value &idval,
jsid *idp, MutableHandleValue vp)
MutableHandleId idp, MutableHandleValue vp)
{
#if JS_HAS_XML_SUPPORT
if (idval.isObject()) {
JSObject *idobj = &idval.toObject();
if (obj && obj->isXML()) {
*idp = OBJECT_TO_JSID(idobj);
idp.set(OBJECT_TO_JSID(idobj));
vp.set(idval);
return true;
}
if (js_GetLocalNameFromFunctionQName(idobj, idp, cx)) {
vp.set(IdToValue(*idp));
if (js_GetLocalNameFromFunctionQName(idobj, idp.address(), cx)) {
vp.set(IdToValue(idp));
return true;
}
if (!obj && idobj->isXMLId()) {
*idp = OBJECT_TO_JSID(idobj);
idp.set(OBJECT_TO_JSID(idobj));
vp.set(idval);
return JS_TRUE;
}
@@ -445,7 +445,7 @@ js::InternNonIntElementId(JSContext *cx, JSObject *obj, const Value &idval,
if (!atom)
return false;
*idp = AtomToId(atom);
idp.set(AtomToId(atom));
vp.setString(atom);
return true;
}