wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 956553 - Remove js::IdToJsval in favour of js::IdToValue; r=luke

Browse Source
This commit is contained in:
Ms2ger 2014-01-20 08:58:27 +01:00
parent 9988c0aff8
commit 24d947ef8f
5 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/builtin/TypedObject.cpp
View File

@ -898,7 +898,7 @@ StructType::layout(JSContext *cx, HandleObject structType, HandleObject fields)
// Check that all the property names are non-numeric strings.
uint32_t unused;
if (!JSID_IS_ATOM(id) || JSID_TO_ATOM(id)->isIndex(&unused)) {
RootedValue idValue(cx, IdToJsval(id));
RootedValue idValue(cx, IdToValue(id));
ReportCannotConvertTo(cx, idValue, "StructType field name");
return false;
}

2
js/src/jsapi.cpp
View File

@ -2239,7 +2239,7 @@ JS_IdToValue(JSContext *cx, jsid id, MutableHandleValue vp)
{
AssertHeapIsIdle(cx);
CHECK_REQUEST(cx);
vp.set(IdToJsval(id));
vp.set(IdToValue(id));
assertSameCompartment(cx, vp);
return true;
}

6
js/src/jsfriendapi.h
View File

@ -1766,12 +1766,6 @@ IdToValue(jsid id)
return JS::UndefinedValue();
}
static JS_ALWAYS_INLINE jsval
IdToJsval(jsid id)
{
return IdToValue(id);
}
extern JS_FRIEND_API(bool)
IsReadOnlyDateMethod(JS::IsAcceptableThis test, JS::NativeImpl method);

2
js/src/vm/OldDebugAPI.cpp
View File

@ -627,7 +627,7 @@ static bool
GetPropertyDesc(JSContext *cx, JSObject *obj_, HandleShape shape, JSPropertyDesc *pd)
{
assertSameCompartment(cx, obj_);
pd->id = IdToJsval(shape->propid());
pd->id = IdToValue(shape->propid());
RootedObject obj(cx, obj_);

2
js/xpconnect/src/XPCQuickStubs.h
View File

@ -643,7 +643,7 @@ GeneratePropertyOp(JSContext *cx, JS::HandleObject obj, JS::HandleId id, unsigne
JS_SetPrivate(ptrobj, popp);
js::SetFunctionNativeReserved(funobj, 0, OBJECT_TO_JSVAL(ptrobj));
js::SetFunctionNativeReserved(funobj, 1, js::IdToJsval(id));
js::SetFunctionNativeReserved(funobj, 1, js::IdToValue(id));
return funobj;
}