Skip to content

Mac RCTDisplayLink fix plus bonus deprecated API cleanup #854

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

Merged
merged 8 commits into from
Oct 15, 2021
Merged

Mac RCTDisplayLink fix plus bonus deprecated API cleanup #854

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eeb8266
Remove deprecated/unused context param
ntre Oct 11, 2021
d23bc03
Merge branch 'master' of https://github.com/microsoft/react-native-macos
ntre Oct 12, 2021
347af73
Update a few Mac deprecated APIs
ntre Oct 12, 2021
893b84f
Defensive changes to Mac RCTDisplayLink
ntre Oct 12, 2021
a3f3f57
Merge remote-tracking branch 'upstream/master'
ntre Oct 12, 2021
6f35dab
Merge branch 'microsoft:master' into master
ntre Oct 12, 2021
9f34f51
Merge branch 'master' of https://github.com/ntre/react-native-macos
ntre Oct 15, 2021
dc7384f
Add GH#858 TODO comment
ntre Oct 15, 2021
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
12 changes: 9 additions & 3 deletions React/Base/RCTDisplayLink.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,13 @@ - (void)dealloc

- (void)invalidate
{
// ensure observer callbacks do not hold a reference to weak self via pauseCallback
for (RCTModuleData *moduleData in _frameUpdateObservers) {
id<RCTFrameUpdateObserver> observer = (id<RCTFrameUpdateObserver>)moduleData.instance;
[observer setPauseCallback:nil];
}
[_frameUpdateObservers removeAllObjects]; // just to be explicit

[_jsDisplayLink invalidate];
}

Expand Down Expand Up @@ -146,14 +153,13 @@ - (void)updateJSDisplayLinkState
BOOL pauseDisplayLink = YES;
for (RCTModuleData *moduleData in _frameUpdateObservers) {
id<RCTFrameUpdateObserver> observer = (id<RCTFrameUpdateObserver>)moduleData.instance;
BOOL validObserverProtocol = [observer conformsToProtocol:@protocol(RCTFrameUpdateObserver)]; // [TODO: GH#774- add protocol check before accessing data
RCTAssert(validObserverProtocol, @"Observer does not conform to necessary protocol (RCTFrameUpdateObserver)");
if (validObserverProtocol && !observer.paused) { // TODO: GH#774- add protocol check before accessing data]
if (!observer.paused) {
pauseDisplayLink = NO;
break;
}
}

// Update the state of display link (call start/stop)
_jsDisplayLink.paused = pauseDisplayLink;
}

Expand Down
1 change: 1 addition & 0 deletions React/Base/macOS/RCTPlatformDisplayLink.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ - (void)dealloc
if (_displayLink != NULL) {
CVDisplayLinkStop(_displayLink);
CVDisplayLinkRelease(_displayLink);
_displayLink = NULL;
}
}

Expand Down