Fix GTK redraw call being called from non-GTK thread. #173602
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gtk_widget_queue_draw is not thread-safe, call it from an idle callback. Fixes flutter#173447
|
It looks like this pull request may not have tests. Please make sure to add tests or get an explicit test exemption before merging. If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix? Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.If you believe this PR qualifies for a test exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!). The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group. |
Contributor
There was a problem hiding this comment.
Code Review
This pull request correctly addresses a thread-safety issue by moving the gtk_widget_queue_draw call into an idle callback, ensuring it runs on the main GTK thread. The logic for handling the first frame has also been consolidated into the new redraw_cb function. This not only fixes the bug but also improves the code's structure and thread safety regarding the have_first_frame flag. The changes are well-implemented and effectively resolve the issue.
Contributor
Author
|
The fix was found by enabling tsan in the Flutter engine build. It also showed some potential issues coming from the Linux task runner, which I will investigate in the future. |
mattkae
approved these changes
Aug 12, 2025
Contributor
mattkae
left a comment
There was a problem hiding this comment.
Just a thought, but feel free to merge!
Contributor
|
Also - I tested and it works well for me! CC: @loic-sharma |
Contributor
|
test-exempt: unblocks enabling tooling that catches it |
|
Failed to create CP due to merge conflicts. |
Contributor
|
@robert-ancell @loic-sharma We'll need to manually CP this to https://github.com/flutter/flutter/tree/flutter-3.35-candidate.0. Can one of you help out here? Thanks! |
robert-ancell
added a commit
to robert-ancell/flutter
that referenced
this pull request
Aug 12, 2025
gtk_widget_queue_draw is not thread-safe, call it from an idle callback. Fixes flutter#173447
Contributor
Author
robert-ancell
added a commit
to robert-ancell/flutter
that referenced
this pull request
Aug 13, 2025
gtk_widget_queue_draw is not thread-safe, call it from an idle callback. Fixes flutter#173447
Contributor
Author
|
And cherry pick for 3.36 branch as requested by @loic-sharma in #173669 |
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 13, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 13, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 13, 2025
auto-submit bot
pushed a commit
that referenced
this pull request
Aug 13, 2025
…ad (#173669) Cherry pick of #173602 Impacted users: All Linux users of Flutter Impact Description: Due to calling gtk_window_redraw on a Flutter thread a lock up may occur. The Flutter app will then become unresponsive. Workaround: No workaround Risk: Low - fix is to run the GTK call on the GTK thread which is what the correct behaviour should be. Test coverage: Rendering covered by existing tests, use of thread not explicitly tested, but #173660 opened to add this in future. Validation Steps: Run test program in #173447 which generates many frames and maximizes the chance of a lock up.
auto-submit bot
pushed a commit
that referenced
this pull request
Aug 13, 2025
…ad (#173667) Cherry pick of #173602 Impacted users: All Linux users of Flutter Impact Description: Due to calling gtk_window_redraw on a Flutter thread a lock up may occur. The Flutter app will then become unresponsive. Workaround: No workaround Risk: Low - fix is to run the GTK call on the GTK thread which is what the correct behaviour should be. Test coverage: Rendering covered by existing tests, use of thread not explicitly tested, but #173660 opened to add this in future. Validation Steps: Run test program in #173447 which generates many frames and maximizes the chance of a lock up.
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 13, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 13, 2025
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 13, 2025
auto-submit bot
pushed a commit
to flutter/packages
that referenced
this pull request
Aug 13, 2025
Roll Flutter from e2a347b to 34c2a3b (41 revisions) flutter/flutter@e2a347b...34c2a3b 2025-08-13 bkonyi@google.com [ Tool ] Mark Linux_pixel_7pro linux_chrome_dev_mode as bringup (flutter/flutter#173646) 2025-08-13 bkonyi@google.com [ Widget Preview ] Move `--dtd-url` from a global flag to a `widget-preview start` option (flutter/flutter#173712) 2025-08-13 jssaadeh@outlook.com Null aware elements clean-ups (flutter/flutter#173074) 2025-08-13 engine-flutter-autoroll@skia.org Roll Skia from 29e3e1ab7f62 to f7fdda3cd0e6 (3 revisions) (flutter/flutter#173709) 2025-08-13 matt.kosarek@canonical.com Regular windows win32 engine (flutter/flutter#173424) 2025-08-13 engine-flutter-autoroll@skia.org Roll Dart SDK from a098cb676fd6 to 73153bdc1459 (1 revision) (flutter/flutter#173708) 2025-08-13 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from vgv-rTf7i9PfcDq2Y... to I1TfNmsqTp7t3rO8e... (flutter/flutter#173690) 2025-08-13 engine-flutter-autoroll@skia.org Roll Skia from 1170405c30cf to 29e3e1ab7f62 (2 revisions) (flutter/flutter#173689) 2025-08-13 engine-flutter-autoroll@skia.org Roll Dart SDK from e2b7aec7333e to a098cb676fd6 (4 revisions) (flutter/flutter#173683) 2025-08-13 engine-flutter-autoroll@skia.org Roll Skia from d06fdf03c6a1 to 1170405c30cf (4 revisions) (flutter/flutter#173681) 2025-08-13 engine-flutter-autoroll@skia.org Roll Skia from 9ed4b4e53db2 to d06fdf03c6a1 (11 revisions) (flutter/flutter#173661) 2025-08-12 robert.ancell@canonical.com Fix GTK redraw call being called from non-GTK thread. (flutter/flutter#173602) 2025-08-12 jason-simmons@users.noreply.github.com [Impeller] Apply Y coordinate scaling when sampling from the destination texture in framebuffer advanced blends (flutter/flutter#173639) 2025-08-12 11901536+romaingyh@users.noreply.github.com Fix directional focus in nested scrollables with different axis (flutter/flutter#172875) 2025-08-12 41930132+hellohuanlin@users.noreply.github.com [ios][tools]do not log "bonjour not found" at all (unless verbose) (flutter/flutter#173569) 2025-08-12 1063596+reidbaker@users.noreply.github.com Remove jetifier usages (flutter/flutter#173548) 2025-08-12 bkonyi@google.com [ Tool ] Fix run_linux_chrome_dev_mode (flutter/flutter#173647) 2025-08-12 41930132+hellohuanlin@users.noreply.github.com [ios] Update iOS code signing CIPD instruction command (flutter/flutter#171173) 2025-08-12 bkonyi@google.com Reapply "Make device debuggable if useDwdsWebSocketConnection is true … (#173551)" (flutter/flutter#173628) 2025-08-12 jason-simmons@users.noreply.github.com Roll Clang to 8c7a2ce01a77c96028fe2c8566f65c45ad9408d3 (flutter/flutter#173429) 2025-08-12 mdebbar@google.com [web] Fallback to CanvasKit when WebGL is not available (flutter/flutter#173629) 2025-08-12 engine-flutter-autoroll@skia.org Roll Packages from a114ac2 to 08a9b2c (3 revisions) (flutter/flutter#173625) 2025-08-12 bkonyi@google.com [ Tool ] Fix crash from possible DDS startup race (flutter/flutter#173362) 2025-08-12 engine-flutter-autoroll@skia.org Roll Skia from a2936eff2179 to 9ed4b4e53db2 (3 revisions) (flutter/flutter#173611) 2025-08-12 49699333+dependabot[bot]@users.noreply.github.com Bump actions/checkout from 4 to 5 in the all-github-actions group (flutter/flutter#173606) 2025-08-12 engine-flutter-autoroll@skia.org Roll Dart SDK from c5fe48aee60d to e2b7aec7333e (1 revision) (flutter/flutter#173604) 2025-08-12 engine-flutter-autoroll@skia.org Roll Skia from 44bb9d908ee4 to a2936eff2179 (21 revisions) (flutter/flutter#173603) 2025-08-12 ybz975218925@gmail.com Fix the issue of over-scrolling in SliverMainAxisGroup with a PinnedHeaderSliver. (flutter/flutter#173349) 2025-08-12 engine-flutter-autoroll@skia.org Roll Dart SDK from b2a23936f968 to c5fe48aee60d (2 revisions) (flutter/flutter#173596) 2025-08-11 fmalita@gmail.com Update CanRenderTiledTexture unit tests (flutter/flutter#173553) 2025-08-11 15619084+vashworth@users.noreply.github.com Update integration test for iOS deployment workflows (flutter/flutter#173566) 2025-08-11 30870216+gaaclarke@users.noreply.github.com Enables vulkan for PowerVR B-Series (flutter/flutter#173561) 2025-08-11 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Reapply "Make device debuggable if useDwdsWebSocketConnection is true … (#173551)" (#173568)" (flutter/flutter#173587) 2025-08-11 engine-flutter-autoroll@skia.org Roll Dart SDK from 8e882349fcab to b2a23936f968 (2 revisions) (flutter/flutter#173571) 2025-08-11 bkonyi@google.com Reapply "Make device debuggable if useDwdsWebSocketConnection is true … (#173551)" (flutter/flutter#173568) 2025-08-11 15619084+vashworth@users.noreply.github.com Update CI iOS tests (flutter/flutter#173563) 2025-08-11 engine-flutter-autoroll@skia.org Roll Packages from 34948d1 to a114ac2 (4 revisions) (flutter/flutter#173556) 2025-08-11 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from HclTm0V8hgSpfqmtG... to vgv-rTf7i9PfcDq2Y... (flutter/flutter#173505) 2025-08-11 engine-flutter-autoroll@skia.org Roll Dart SDK from 6a7ae1ffd1c9 to 8e882349fcab (2 revisions) (flutter/flutter#173499) 2025-08-11 32538273+ValentinVignal@users.noreply.github.com Update `ExpansibleController` in `ExpansionTile` `didUpdateWidget` (flutter/flutter#173175) 2025-08-11 41930132+hellohuanlin@users.noreply.github.com add format cmd to tools instruction (flutter/flutter#173428) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC louisehsu@google.com,stuartmorgan@google.com on the revert to ensure that a human ...
SydneyBao
pushed a commit
to SydneyBao/flutter
that referenced
this pull request
Aug 14, 2025
gtk_widget_queue_draw is not thread-safe, call it from an idle callback. Fixes flutter#173447
ksokolovskyi
pushed a commit
to ksokolovskyi/flutter
that referenced
this pull request
Aug 19, 2025
gtk_widget_queue_draw is not thread-safe, call it from an idle callback. Fixes flutter#173447
mboetger
pushed a commit
to mboetger/flutter
that referenced
this pull request
Sep 18, 2025
gtk_widget_queue_draw is not thread-safe, call it from an idle callback. Fixes flutter#173447
korca0220
pushed a commit
to korca0220/flutter
that referenced
this pull request
Sep 22, 2025
gtk_widget_queue_draw is not thread-safe, call it from an idle callback. Fixes flutter#173447
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Nov 12, 2025
lucaantonelli
pushed a commit
to lucaantonelli/flutter
that referenced
this pull request
Nov 21, 2025
gtk_widget_queue_draw is not thread-safe, call it from an idle callback. Fixes flutter#173447
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
gtk_widget_queue_draw is not thread-safe, call it from an idle callback.
Fixes #173447