DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix MouseTracker annotation leak (#28990)

Browse Source 
* Fix MouseTracker annotation leak

Map's remove method is typed `remove(Object key)`, which can cause bugs.

Modified the existing test to check if the annotation has been removed
from MouseTracker.
This commit is contained in:
Dwayne Slater 2019-03-11 16:41:10 -04:00 committed by Dan Field
parent e9be230a06
commit b19df00c8e
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/flutter/lib/src/gestures/mouse_tracking.dart
View File

@ -124,7 +124,7 @@ class MouseTracker {
for (int deviceId in trackedAnnotation.activeDevices) {
annotation.onExit(PointerExitEvent.fromHoverEvent(_lastMouseEvent[deviceId]));
}
_trackedAnnotations.remove(trackedAnnotation);
_trackedAnnotations.remove(annotation);
}
void _scheduleMousePositionCheck() {
@ -171,6 +171,16 @@ class MouseTracker {
return trackedAnnotation;
}
/// Checks if the given [MouseTrackerAnnotation] is attached to this
/// [MouseTracker].
///
/// This function is only public to allow for proper testing of the
/// MouseTracker. Do not call in other contexts.
@visibleForTesting
bool isAnnotationAttached(MouseTrackerAnnotation annotation) {
return _trackedAnnotations[annotation] != null;
}
/// Tells interested objects that a mouse has entered, exited, or moved, given
/// a callback to fetch the [MouseTrackerAnnotation] associated with a global
/// offset.

7
packages/flutter/lib/src/rendering/proxy_box.dart
View File

@ -2591,6 +2591,13 @@ class RenderPointerListener extends RenderProxyBoxWithHitTestBehavior {
// Object used for annotation of the layer used for hover hit detection.
MouseTrackerAnnotation _hoverAnnotation;
/// Object used for annotation of the layer used for hover hit detection.
///
/// This is only public to allow for testing of Listener widgets. Do not call
/// in other contexts.
@visibleForTesting
MouseTrackerAnnotation get hoverAnnotation => _hoverAnnotation;
void _updateAnnotations() {
if (_hoverAnnotation != null && attached) {
RendererBinding.instance.mouseTracker.detachAnnotation(_hoverAnnotation);

3
packages/flutter/test/widgets/listener_test.dart
View File

@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter/gestures.dart';
@ -109,6 +110,7 @@ void main() {
onPointerExit: (PointerExitEvent details) => exit = details,
),
));
final RenderPointerListener renderListener = tester.renderObject(find.byType(Listener));
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
await gesture.moveTo(const Offset(400.0, 300.0));
await tester.pump();
@ -125,6 +127,7 @@ void main() {
));
expect(exit, isNotNull);
expect(exit.position, equals(const Offset(400.0, 300.0)));
expect(tester.binding.mouseTracker.isAnnotationAttached(renderListener.hoverAnnotation), isFalse);
});
});
}