Bug 797821 - Removed the unused reserved slot for XPConnect globals. r=mrbkap

This commit is contained in:
Bobby Holley 2012-10-25 17:01:09 +02:00
parent 1fd1acf5e9
commit 3d0731683a
2 changed files with 3 additions and 5 deletions

View File

@ -22,10 +22,8 @@ class nsCycleCollectionParticipant;
// bindings.
#define DOM_XRAY_EXPANDO_SLOT 1
// All DOM globals must have a slot at DOM_PROTOTYPE_SLOT. We have to
// start at 1 past JSCLASS_GLOBAL_SLOT_COUNT because XPConnect uses
// that one.
#define DOM_PROTOTYPE_SLOT (JSCLASS_GLOBAL_SLOT_COUNT + 1)
// All DOM globals must have a slot at DOM_PROTOTYPE_SLOT.
#define DOM_PROTOTYPE_SLOT JSCLASS_GLOBAL_SLOT_COUNT
// We use these flag bits for the new bindings.
#define JSCLASS_DOM_GLOBAL JSCLASS_USERBIT1

View File

@ -45,7 +45,7 @@ TransplantObjectWithWrapper(JSContext *cx,
#define XPCONNECT_GLOBAL_FLAGS \
JSCLASS_DOM_GLOBAL | JSCLASS_HAS_PRIVATE | \
JSCLASS_PRIVATE_IS_NSISUPPORTS | JSCLASS_IMPLEMENTS_BARRIERS | \
JSCLASS_GLOBAL_FLAGS_WITH_SLOTS(3)
JSCLASS_GLOBAL_FLAGS_WITH_SLOTS(2)
void
TraceXPCGlobal(JSTracer *trc, JSObject *obj);