bug 484861 - removal of unsed fields from JSObjectOps. r=mrbkap

This commit is contained in:
Igor Bukanov 2009-04-01 14:32:51 +02:00
parent ab05dfaaab
commit 9752bd3059
8 changed files with 15 additions and 40 deletions

View File

@ -1222,10 +1222,9 @@ JSObjectOps js_ArrayObjectOps = {
array_enumerate, js_CheckAccess,
NULL, array_dropProperty,
NULL, NULL,
NULL, js_HasInstance,
js_SetProtoOrParent, js_SetProtoOrParent,
array_trace, NULL,
NULL, NULL
js_HasInstance, array_trace,
NULL, NULL,
NULL
};
static JSObjectOps *

View File

@ -110,10 +110,9 @@ JS_FRIEND_DATA(JSObjectOps) js_ObjectOps = {
js_Enumerate, js_CheckAccess,
NULL, NATIVE_DROP_PROPERTY,
js_Call, js_Construct,
NULL, js_HasInstance,
js_SetProtoOrParent, js_SetProtoOrParent,
js_TraceObject, js_Clear,
js_GetRequiredSlot, js_SetRequiredSlot
js_HasInstance, js_TraceObject,
js_Clear, js_GetRequiredSlot,
js_SetRequiredSlot
};
JSClass js_ObjectClass = {
@ -2353,10 +2352,9 @@ JS_FRIEND_DATA(JSObjectOps) js_WithObjectOps = {
with_Enumerate, with_CheckAccess,
with_ThisObject, NATIVE_DROP_PROPERTY,
NULL, NULL,
NULL, NULL,
js_SetProtoOrParent, js_SetProtoOrParent,
js_TraceObject, js_Clear,
NULL, NULL
NULL, js_TraceObject,
js_Clear, NULL,
NULL
};
static JSObjectOps *

View File

@ -75,10 +75,7 @@ struct JSObjectOps {
JSPropertyRefOp dropProperty;
JSNative call;
JSNative construct;
JSXDRObjectOp xdrObject;
JSHasInstanceOp hasInstance;
JSSetObjectSlotOp setProto;
JSSetObjectSlotOp setParent;
JSTraceOp trace;
JSFinalizeOp clear;
JSGetRequiredSlotOp getRequiredSlot;

View File

@ -356,15 +356,6 @@ typedef JSBool
typedef void
(* JSPropertyRefOp)(JSContext *cx, JSObject *obj, JSProperty *prop);
/*
* Function pointer type for JSObjectOps.setProto and JSObjectOps.setParent.
* These hooks must check for cycles without deadlocking, and otherwise take
* special steps. See jsobj.c and jsgc.c for details.
*/
typedef JSBool
(* JSSetObjectSlotOp)(JSContext *cx, JSObject *obj, uint32 slot,
JSObject *pobj);
/*
* Get and set a required slot, one that should already have been allocated.
* These operations are infallible, so required slots must be pre-allocated,

View File

@ -5438,10 +5438,9 @@ JS_FRIEND_DATA(JSObjectOps) js_XMLObjectOps = {
xml_enumerate, js_CheckAccess,
NULL, NULL,
NULL, NULL,
NULL, xml_hasInstance,
js_SetProtoOrParent, js_SetProtoOrParent,
js_TraceObject, xml_clear,
NULL, NULL
xml_hasInstance, js_TraceObject,
xml_clear, NULL,
NULL
};
static JSObjectOps *

View File

@ -424,11 +424,8 @@ JSObjectOps JavaArray_ops = {
NULL, /* dropProperty */
NULL, /* call */
NULL, /* construct */
NULL, /* xdrObject */
NULL, /* hasInstance */
NULL, /* setProto */
NULL, /* setParent */
NULL, /* mark */
NULL, /* trace */
NULL, /* clear */
jsj_wrapper_getRequiredSlot, /* getRequiredSlot */
jsj_wrapper_setRequiredSlot /* setRequiredSlot */

View File

@ -549,11 +549,8 @@ JSObjectOps JavaClass_ops = {
NULL, /* dropProperty */
jsj_JavaConstructorWrapper, /* call */
jsj_JavaConstructorWrapper, /* construct */
NULL, /* xdrObject */
JavaClass_hasInstance, /* hasInstance */
NULL, /* setProto */
NULL, /* setParent */
NULL, /* mark */
NULL, /* trace */
NULL, /* clear */
jsj_wrapper_getRequiredSlot, /* getRequiredSlot */
jsj_wrapper_setRequiredSlot /* setRequiredSlot */

View File

@ -1057,11 +1057,8 @@ JSObjectOps JavaObject_ops = {
NULL, /* dropProperty */
NULL, /* call */
NULL, /* construct */
NULL, /* xdrObject */
NULL, /* hasInstance */
NULL, /* setProto */
NULL, /* setParent */
NULL, /* mark */
NULL, /* trace */
NULL, /* clear */
jsj_wrapper_getRequiredSlot, /* getRequiredSlot */
jsj_wrapper_setRequiredSlot /* setRequiredSlot */