fix(ios): remove additional gc protection once proxy is remembered (#…

…11274)
tidev · Oct 14, 2019 · dfd5a02 · dfd5a02
1 parent a341c1b
commit dfd5a02
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/iphone/Classes/TiAppiOSProxy.h b/iphone/Classes/TiAppiOSProxy.h
@@ -21,6 +21,10 @@
 @property (nonatomic, readonly) NSString *EVENT_ACCESSIBILITY_LAYOUT_CHANGED;
 @property (nonatomic, readonly) NSString *EVENT_ACCESSIBILITY_SCREEN_CHANGED;
 
+#ifdef DEBUG
+- (void)garbageCollectForDebugging:(id)args;
+#endif
+
 @end
 
 #endif
diff --git a/iphone/Classes/TiAppiOSProxy.m b/iphone/Classes/TiAppiOSProxy.m
@@ -1541,6 +1541,15 @@ - (NSString *)applicationOpenSettingsURL
   return UIApplicationOpenSettingsURLString;
 }
 
+#ifdef DEBUG
+JS_EXPORT void JSSynchronousGarbageCollectForDebugging(JSContextRef ctx);
+
+- (void)garbageCollectForDebugging:(id)args
+{
+  JSSynchronousGarbageCollectForDebugging(self.pageContext.krollContext.context);
+}
+#endif
+
 MAKE_SYSTEM_STR(EVENT_ACCESSIBILITY_LAYOUT_CHANGED, @"accessibilitylayoutchanged");
 MAKE_SYSTEM_STR(EVENT_ACCESSIBILITY_SCREEN_CHANGED, @"accessibilityscreenchanged");
 

diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiProxy.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiProxy.m
@@ -638,9 +638,12 @@ - (void)rememberProxy:(TiProxy *)rememberedProxy
   if ((bridgeCount == 1) && (pageKrollObject != nil)) {
     if (rememberedProxy == self) {
       [pageKrollObject protectJsobject];
+      [pageKrollObject removeGarbageCollectionSafeguard];
       return;
     }
-    [pageKrollObject noteKeylessKrollObject:[rememberedProxy krollObjectForBridge:(KrollBridge *)pageContext]];
+    KrollObject *krollObject = [rememberedProxy krollObjectForBridge:(KrollBridge *)pageContext];
+    [pageKrollObject noteKeylessKrollObject:krollObject];
+    [krollObject removeGarbageCollectionSafeguard];
     return;
   }
   if (bridgeCount < 1) {
@@ -652,13 +655,16 @@ - (void)rememberProxy:(TiProxy *)rememberedProxy
     if (rememberedProxy == self) {
       KrollObject *thisObject = [thisBridge krollObjectForProxy:self];
       [thisObject protectJsobject];
+      [thisObject removeGarbageCollectionSafeguard];
       continue;
     }
 
     if (![thisBridge usesProxy:rememberedProxy]) {
       continue;
     }
-    [[thisBridge krollObjectForProxy:self] noteKeylessKrollObject:[thisBridge krollObjectForProxy:rememberedProxy]];
+    KrollObject *krollObject = [thisBridge krollObjectForProxy:rememberedProxy];
+    [[thisBridge krollObjectForProxy:self] noteKeylessKrollObject:krollObject];
+    [krollObject removeGarbageCollectionSafeguard];
   }
 }