Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ios): remove additional gc protection once proxy is remembered (8_1_X) #11029

Closed
wants to merge 2 commits into from
Closed

fix(ios): remove additional gc protection once proxy is remembered (8_1_X) #11029

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c88d6e6
fix(ios): remove additional gc protection once proxy is remembered
janvennemann Jul 4, 2019
14ab1fd
Merge branch '8_1_X' into TIMOB-27207-8_1_X
lokeshchdhry Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions iphone/TitaniumKit/TitaniumKit/Sources/API/TiProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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];
}
}

Expand Down