Use JSGlobalContextRef for context_; retain/release.

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 377af6d64f4970b8c0992f7bd8292a6b7403e543..e7ed92d5654fff47b33e3a350df7951cda0dffd7 100644 (file)
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -567,7 +567,7 @@ NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 /* Bridge: CYJSObject {{{ */
 @interface CYJSObject : NSMutableDictionary {
     JSObjectRef object_;
 /* Bridge: CYJSObject {{{ */
 @interface CYJSObject : NSMutableDictionary {
     JSObjectRef object_;

-    JSContextRef context_;
+    JSGlobalContextRef context_;

 }
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context;
 }
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context;


@@ -585,7 +585,7 @@ NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) {
 /* Bridge: CYJSArray {{{ */
 @interface CYJSArray : NSMutableArray {
     JSObjectRef object_;
 /* Bridge: CYJSArray {{{ */
 @interface CYJSArray : NSMutableArray {
     JSObjectRef object_;

-    JSContextRef context_;
+    JSGlobalContextRef context_;

 }
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context;
 }
 
 - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context;


@@ -1173,14 +1173,14 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
     if ((self = [super init]) != nil) {
         object_ = object;
         context_ = CYGetJSContext(context);
     if ((self = [super init]) != nil) {
         object_ = object;
         context_ = CYGetJSContext(context);

-        //XXX:JSGlobalContextRetain(context_);
+        JSGlobalContextRetain(context_);

         JSValueProtect(context_, object_);
     } return self;
 } CYObjectiveCatch }
 
 - (void) dealloc { CYObjectiveTry {
     JSValueUnprotect(context_, object_);
         JSValueProtect(context_, object_);
     } return self;
 } CYObjectiveCatch }
 
 - (void) dealloc { CYObjectiveTry {
     JSValueUnprotect(context_, object_);

-    //XXX:JSGlobalContextRelease(context_);
+    JSGlobalContextRelease(context_);

     [super dealloc];
 } CYObjectiveCatch }
 
     [super dealloc];
 } CYObjectiveCatch }
 


@@ -1251,14 +1251,14 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
     if ((self = [super init]) != nil) {
         object_ = object;
         context_ = CYGetJSContext(context);
     if ((self = [super init]) != nil) {
         object_ = object;
         context_ = CYGetJSContext(context);

-        //XXX:JSGlobalContextRetain(context_);
+        JSGlobalContextRetain(context_);

         JSValueProtect(context_, object_);
     } return self;
 } CYObjectiveCatch }
 
 - (void) dealloc { CYObjectiveTry {
     JSValueUnprotect(context_, object_);
         JSValueProtect(context_, object_);
     } return self;
 } CYObjectiveCatch }
 
 - (void) dealloc { CYObjectiveTry {
     JSValueUnprotect(context_, object_);

-    //XXX:JSGlobalContextRelease(context_);
+    JSGlobalContextRelease(context_);

     [super dealloc];
 } CYObjectiveCatch }
 
     [super dealloc];
 } CYObjectiveCatch }
 


@@ -1325,7 +1325,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 
 // XXX: inherit from or replace with CYJSObject
 @interface CYInternal : NSObject {
 
 // XXX: inherit from or replace with CYJSObject
 @interface CYInternal : NSObject {

-    JSContextRef context_;
+    JSGlobalContextRef context_;

     JSObjectRef object_;
 }
 
     JSObjectRef object_;
 }
 


@@ -1335,14 +1335,14 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 
 - (void) dealloc {
     JSValueUnprotect(context_, object_);
 
 - (void) dealloc {
     JSValueUnprotect(context_, object_);

-    //XXX:JSGlobalContextRelease(context_);
+    JSGlobalContextRelease(context_);

     [super dealloc];
 }
 
 - (id) initInContext:(JSContextRef)context {
     if ((self = [super init]) != nil) {
         context_ = CYGetJSContext(context);
     [super dealloc];
 }
 
 - (id) initInContext:(JSContextRef)context {
     if ((self = [super init]) != nil) {
         context_ = CYGetJSContext(context);

-        //XXX:JSGlobalContextRetain(context_);
+        JSGlobalContextRetain(context_);

     } return self;
 }
 
     } return self;
 }