firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix timer keeps active when resampling disabled in some cases (#97197)

Browse Source
This commit is contained in:
wangying 2022-02-09 18:25:06 +08:00 committed by GitHub
parent 3669e3669a
commit 499e900e39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/flutter/lib/src/gestures/binding.dart
View File

@ -180,6 +180,7 @@ class _Resampler {
} }
_resamplers.clear(); _resamplers.clear();
_frameTime = Duration.zero; _frameTime = Duration.zero;
_timer?.cancel();
} }
void _onSampleTimeChanged() { void _onSampleTimeChanged() {

16
packages/flutter/test/gestures/gesture_binding_resample_event_on_widget_test.dart
View File

@ -123,4 +123,20 @@ void main() {
expect(events[3].timeStamp, currentTestFrameTime() + kSamplingOffset); expect(events[3].timeStamp, currentTestFrameTime() + kSamplingOffset);
expect(events[3], isA<PointerUpEvent>()); expect(events[3], isA<PointerUpEvent>());
}); });
testWidgets('Timer should be canceled when resampling stopped', (WidgetTester tester) async {
// A timer will be started when event's timeStamp is larger than sampleTime.
final ui.PointerDataPacket packet = ui.PointerDataPacket(
data: <ui.PointerData>[
ui.PointerData(
timeStamp: Duration(microseconds: DateTime.now().microsecondsSinceEpoch),
),
],
);
GestureBinding.instance.resamplingEnabled = true;
ui.window.onPointerDataPacket!(packet);
// Expected to stop resampling, but the timer keeps active if _timer?.cancel() not be called.
GestureBinding.instance.resamplingEnabled = false;
});
} }