Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[macOS] Handle interleaved movement and gesture events #52201

Merged
merged 3 commits into from
Apr 17, 2024

Conversation

knopp
Copy link
Member

@knopp knopp commented Apr 17, 2024

Fixes flutter/flutter#146893

The crash happens, because with magic mouse, it is quite common to receive mouseExited: event while the gesture event is still in progress. This would reset the gesture state while the gesture event is still active, leading to assertion when the gesture event ends.

The state machine assumes that when mouse exists that also ends any gesture events. However that is not the case with magic mouse, which handles the movement and gesture events separately.

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@knopp
Copy link
Member Author

knopp commented Apr 17, 2024

@moffatman, can you think of any unwanted side-effects of not calling GestureReset() from Reset()?

@knopp knopp force-pushed the macos_movement_and_scroll_event_separate branch from d55bbc3 to 7e9a78c Compare April 17, 2024 17:46
Copy link
Member

@cbracken cbracken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM stamp from a Japanese personal seal

Copy link
Contributor

@moffatman moffatman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx

Copy link
Member

@cbracken cbracken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wow the lint bot upset about something that's not formatting :) Looks like just a couple CFRelease calls on the values allocated by CGEventCreateScrollWheelEvent and CGEventCreateCopy.

@knopp knopp merged commit 15cb5fe into flutter:main Apr 17, 2024
25 checks passed
@knopp knopp deleted the macos_movement_and_scroll_event_separate branch April 17, 2024 19:25
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 17, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 17, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Apr 17, 2024
…146946)

flutter/engine@cc73c5c...9edcb26

2024-04-17 [email protected] [Impeller] Delete `EntityPass::AddSubpassInline`. (flutter/engine#52182)
2024-04-17 [email protected] Roll Skia from 2790777048d3 to 0c56bd472923 (4 revisions) (flutter/engine#52203)
2024-04-17 [email protected] [macOS] Handle interleaved movement and gesture events (flutter/engine#52201)
2024-04-17 [email protected] [Impeller] Remove old clip height tracking from Entity. (flutter/engine#52178)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
gilnobrega pushed a commit to gilnobrega/flutter that referenced this pull request Apr 22, 2024
…lutter#146946)

flutter/engine@cc73c5c...9edcb26

2024-04-17 [email protected] [Impeller] Delete `EntityPass::AddSubpassInline`. (flutter/engine#52182)
2024-04-17 [email protected] Roll Skia from 2790777048d3 to 0c56bd472923 (4 revisions) (flutter/engine#52203)
2024-04-17 [email protected] [macOS] Handle interleaved movement and gesture events (flutter/engine#52201)
2024-04-17 [email protected] [Impeller] Remove old clip height tracking from Entity. (flutter/engine#52178)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[macOS] Assertion and crash with magic mouse
3 participants