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 deadstore in RCTSpringAnimation #23643

Closed
wants to merge 7 commits into from
Closed

Fix deadstore in RCTSpringAnimation #23643

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
180dc39
Merge remote-tracking branch 'upstream/master'
ericlewis Feb 22, 2019
aa45f1e
Merge remote-tracking branch 'upstream/master'
ericlewis Feb 22, 2019
2965fcd
Merge remote-tracking branch 'upstream/master'
ericlewis Feb 22, 2019
ae5f574
Merge remote-tracking branch 'upstream/master'
ericlewis Feb 23, 2019
1835aa0
Merge remote-tracking branch 'upstream/master'
ericlewis Feb 23, 2019
4aadca5
Merge remote-tracking branch 'upstream/master'
ericlewis Feb 25, 2019
a771fae
Fix deadstore
ericlewis Feb 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,12 @@ - (void)stepAnimationWithTime:(NSTimeInterval)currentTime
}

// calculate delta time
NSTimeInterval deltaTime;
if(_animationStartTime == -1) {
_t = 0.0;
_animationStartTime = currentTime;
deltaTime = 0.0;
} else {
// Handle frame drops, and only advance dt by a max of MAX_DELTA_TIME
deltaTime = MIN(MAX_DELTA_TIME, currentTime - _animationCurrentTime);
NSTimeInterval deltaTime = MIN(MAX_DELTA_TIME, currentTime - _animationCurrentTime);
_t = _t + deltaTime / RCTAnimationDragCoefficient();
}

Expand Down