Bug 860050 - Remove JSMutableHandleId typedef; r=jonco

--HG--
extra : rebase_source : ca0b47df116527404a9f021bf0f1f6ae880ee2c0
This commit is contained in:
Terrence Cole 2013-04-16 14:46:03 -07:00
parent 081ef5f0ee
commit c9dbce2442
4 changed files with 4 additions and 5 deletions

View File

@ -808,7 +808,6 @@ typedef JS::MutableHandle<JSFunction*> JSMutableHandleFunction;
typedef JS::MutableHandle<JSScript*> JSMutableHandleScript; typedef JS::MutableHandle<JSScript*> JSMutableHandleScript;
typedef JS::MutableHandle<JSString*> JSMutableHandleString; typedef JS::MutableHandle<JSString*> JSMutableHandleString;
typedef JS::MutableHandle<JS::Value> JSMutableHandleValue; typedef JS::MutableHandle<JS::Value> JSMutableHandleValue;
typedef JS::MutableHandle<jsid> JSMutableHandleId;
/* JSClass operation signatures. */ /* JSClass operation signatures. */
@ -882,7 +881,7 @@ typedef JSBool
*/ */
typedef JSBool typedef JSBool
(* JSNewEnumerateOp)(JSContext *cx, JSHandleObject obj, JSIterateOp enum_op, (* JSNewEnumerateOp)(JSContext *cx, JSHandleObject obj, JSIterateOp enum_op,
JSMutableHandleValue statep, JSMutableHandleId idp); JSMutableHandleValue statep, JS::MutableHandleId idp);
/* /*
* The old-style JSClass.enumerate op should define all lazy properties not * The old-style JSClass.enumerate op should define all lazy properties not

View File

@ -4655,7 +4655,7 @@ js::DefaultValue(JSContext *cx, HandleObject obj, JSType hint, MutableHandleValu
JS_FRIEND_API(JSBool) JS_FRIEND_API(JSBool)
JS_EnumerateState(JSContext *cx, JSHandleObject obj, JSIterateOp enum_op, JS_EnumerateState(JSContext *cx, JSHandleObject obj, JSIterateOp enum_op,
JSMutableHandleValue statep, JSMutableHandleId idp) JSMutableHandleValue statep, JS::MutableHandleId idp)
{ {
/* If the class has a custom JSCLASS_NEW_ENUMERATE hook, call it. */ /* If the class has a custom JSCLASS_NEW_ENUMERATE hook, call it. */
Class *clasp = obj->getClass(); Class *clasp = obj->getClass();

View File

@ -1151,7 +1151,7 @@ XPC_WN_Helper_NewResolve(JSContext *cx, JSHandleObject obj, JSHandleId id, unsig
JSBool JSBool
XPC_WN_JSOp_Enumerate(JSContext *cx, JSHandleObject obj, JSIterateOp enum_op, XPC_WN_JSOp_Enumerate(JSContext *cx, JSHandleObject obj, JSIterateOp enum_op,
JSMutableHandleValue statep, JSMutableHandleId idp) JSMutableHandleValue statep, MutableHandleId idp)
{ {
js::Class *clazz = js::GetObjectClass(obj); js::Class *clazz = js::GetObjectClass(obj);
if (!IS_WRAPPER_CLASS(clazz) || clazz == &XPC_WN_NoHelper_JSClass.base) { if (!IS_WRAPPER_CLASS(clazz) || clazz == &XPC_WN_NoHelper_JSClass.base) {

View File

@ -1462,7 +1462,7 @@ XPC_WN_GetterSetter(JSContext *cx, unsigned argc, jsval *vp);
extern JSBool extern JSBool
XPC_WN_JSOp_Enumerate(JSContext *cx, JSHandleObject obj, JSIterateOp enum_op, XPC_WN_JSOp_Enumerate(JSContext *cx, JSHandleObject obj, JSIterateOp enum_op,
JSMutableHandleValue statep, JSMutableHandleId idp); JSMutableHandleValue statep, JS::MutableHandleId idp);
extern JSObject* extern JSObject*
XPC_WN_JSOp_ThisObject(JSContext *cx, JSHandleObject obj); XPC_WN_JSOp_ThisObject(JSContext *cx, JSHandleObject obj);