Skip to content

Commit 2ac7d80

Browse files
janvennemannlokeshchdhry
authored andcommitted
fix(ios): remove additional gc protection once proxy is remembered (#11028)
* fix(ios): remove additional gc protection once proxy is remembered * chore: add temporary debug function * chore: remove debug function
1 parent 8192ea2 commit 2ac7d80

File tree

1 file changed

+8
-2
lines changed
  • iphone/TitaniumKit/TitaniumKit/Sources/API

1 file changed

+8
-2
lines changed

iphone/TitaniumKit/TitaniumKit/Sources/API/TiProxy.m

+8-2
Original file line numberDiff line numberDiff line change
@@ -638,9 +638,12 @@ - (void)rememberProxy:(TiProxy *)rememberedProxy
638638
if ((bridgeCount == 1) && (pageKrollObject != nil)) {
639639
if (rememberedProxy == self) {
640640
[pageKrollObject protectJsobject];
641+
[pageKrollObject removeGarbageCollectionSafeguard];
641642
return;
642643
}
643-
[pageKrollObject noteKeylessKrollObject:[rememberedProxy krollObjectForBridge:(KrollBridge *)pageContext]];
644+
KrollObject *krollObject = [rememberedProxy krollObjectForBridge:(KrollBridge *)pageContext];
645+
[pageKrollObject noteKeylessKrollObject:krollObject];
646+
[krollObject removeGarbageCollectionSafeguard];
644647
return;
645648
}
646649
if (bridgeCount < 1) {
@@ -652,13 +655,16 @@ - (void)rememberProxy:(TiProxy *)rememberedProxy
652655
if (rememberedProxy == self) {
653656
KrollObject *thisObject = [thisBridge krollObjectForProxy:self];
654657
[thisObject protectJsobject];
658+
[thisObject removeGarbageCollectionSafeguard];
655659
continue;
656660
}
657661

658662
if (![thisBridge usesProxy:rememberedProxy]) {
659663
continue;
660664
}
661-
[[thisBridge krollObjectForProxy:self] noteKeylessKrollObject:[thisBridge krollObjectForProxy:rememberedProxy]];
665+
KrollObject *krollObject = [thisBridge krollObjectForProxy:rememberedProxy];
666+
[[thisBridge krollObjectForProxy:self] noteKeylessKrollObject:krollObject];
667+
[krollObject removeGarbageCollectionSafeguard];
662668
}
663669
}
664670

0 commit comments

Comments
 (0)
close