Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-03 07:01:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/jsarray.cpp
View File

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

14
js/src/jsobj.cpp
View File

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

3
js/src/jsobj.h
View File

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

9
js/src/jsprvtd.h
View File

@ -356,15 +356,6 @@ typedef JSBool
typedef void typedef void
(* JSPropertyRefOp)(JSContext *cx, JSObject *obj, JSProperty *prop); (* 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. * Get and set a required slot, one that should already have been allocated.
* These operations are infallible, so required slots must be pre-allocated, * These operations are infallible, so required slots must be pre-allocated,

7
js/src/jsxml.cpp
View File

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

5
js/src/liveconnect/jsj_JavaArray.c
View File

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

5
js/src/liveconnect/jsj_JavaClass.c
View File

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

5
js/src/liveconnect/jsj_JavaObject.c
View File

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