Skip to content

Fix wide gamut macos integration test - #184427

Merged
auto-submit[bot] merged 9 commits into
flutter:masterfrom
walley892:wide-gamut
Apr 3, 2026
Merged

Fix wide gamut macos integration test#184427
auto-submit[bot] merged 9 commits into
flutter:masterfrom
walley892:wide-gamut

Conversation

@walley892

@walley892walley892 commented Mar 31, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

Fixes#182589.

CI machines don't have physical monitors, and the default virtual screen given by MacOS doesn't report wide gamut support. This caused the check in

flutter/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm

Line 808 in 413244e

- (void)updateWideGamutForScreen {
to downgrade the color mode for the tests to sRGB, even though the hardware supports wide-gamut.

This change overrides updateWideGamutForScreen to always enable wide gamut for this test in CI.

This change also updates .ci.yaml to ensure that this test runs on Apple Silicon hardware

Pre-launch Checklist

  • I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
  • I read the [AI contribution guidelines] and understand my responsibilities, or I am not using AI tools.
  • I read the [Tree Hygiene] wiki page, which explains my responsibilities.
  • I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
  • I signed the [CLA].
  • I listed at least one issue that this PR fixes in the description above.
  • I updated/added relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making, or this PR is [test-exempt].
  • I followed the [breaking change policy] and added [Data Driven Fixes] where supported.
  • All existing and new tests are passing.

@walley892walley892 added the CICD Run CI/CD label Mar 31, 2026
@github-actionsgithub-actionsBot added the a: desktop Running on desktop label Mar 31, 2026
@walley892
walley892 marked this pull request as ready for review March 31, 2026 20:35
walley892
walley892 commented Mar 31, 2026
View reviewed changes
Comment thread.ci.yaml Outdated
recipe: devicelab/devicelab_drone
bringup: true
presubmit: false
presubmit: true

@walley892walley892Mar 31, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

These need to be reverted

@gaaclarkegaaclarkeMar 31, 2026•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

fyi I can't approve it until it's reverted since reverting it will remove my approval

@walley892walley892Mar 31, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Will revert once the latest commit goes green for this test!

gemini-code-assist[bot]
gemini-code-assistBot reviewed Mar 31, 2026
View reviewed changes

@gemini-code-assistgemini-code-assistBot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Code Review

This pull request enables presubmit testing for the wide_gamut_macos target on Apple Silicon hardware in .ci.yaml and introduces a macOS integration test that programmatically forces wide-gamut support. Feedback was provided regarding inconsistent indentation in the new Swift file and the removal of a redundant type cast.

Comment threaddev/integration_tests/wide_gamut_test/macos/Runner/MainFlutterWindow.swift Outdated
@github-actionsgithub-actionsBot removed the CICD Run CI/CD label Mar 31, 2026
@walley892walley892 added the CICD Run CI/CD label Mar 31, 2026
gaaclarke
gaaclarke reviewed Mar 31, 2026
View reviewed changes
Comment threaddev/integration_tests/wide_gamut_test/macos/Runner/MainFlutterWindow.swift Outdated
Comment threaddev/integration_tests/wide_gamut_test/macos/Runner/MainFlutterWindow.swift
@github-actionsgithub-actionsBot removed the CICD Run CI/CD label Mar 31, 2026
@walley892walley892 added the CICD Run CI/CD label Mar 31, 2026
@github-actionsgithub-actionsBot removed the CICD Run CI/CD label Mar 31, 2026
@walley892walley892 added the CICD Run CI/CD label Mar 31, 2026
@walley892
walley892 requested a review from a team as a code ownerMarch 31, 2026 22:37
@github-actionsgithub-actionsBot added engine flutter/engine related. See also e: labels. team-macos Owned by the macOS platform team platform-macos and removed CICD Run CI/CD labels Mar 31, 2026
@walley892walley892 added the CICD Run CI/CD label Mar 31, 2026
gaaclarke
gaaclarke reviewed Mar 31, 2026
View reviewed changes
Comment threadengine/src/flutter/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h Outdated
@github-actionsgithub-actionsBot removed CICD Run CI/CD engine flutter/engine related. See also e: labels. team-macos Owned by the macOS platform team platform-macos labels Mar 31, 2026
@walley892
walley892 removed the request for review from a teamMarch 31, 2026 23:06
@walley892walley892 added the CICD Run CI/CD label Mar 31, 2026
gaaclarke
gaaclarke previously approved these changes Mar 31, 2026
View reviewed changes

@gaaclarkegaaclarke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

lgtm (assuming the test passes)

@github-actionsgithub-actionsBot removed the CICD Run CI/CD label Mar 31, 2026
gaaclarke
gaaclarke previously approved these changes Mar 31, 2026
View reviewed changes
@walley892

walley892 commented Mar 31, 2026

Copy link
Copy Markdown
ContributorAuthor

Changed ci.yaml back to not running during presubmit. Here's the passing invocation of the affected test https://github.com/flutter/flutter/pull/184427/checks?check_run_id=69441590019

@walley892walley892 added the CICD Run CI/CD label Mar 31, 2026
@github-actionsgithub-actionsBot removed the CICD Run CI/CD label Apr 1, 2026
@walley892walley892 added the CICD Run CI/CD label Apr 1, 2026
@walley892walley892 added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 2, 2026
@auto-submit
auto-submitBot added this pull request to the merge queueApr 3, 2026
Merged via the queue into flutter:master with commit adeb35fApr 3, 2026
161 of 162 checks passed
@flutter-dashboardflutter-dashboardBot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 3, 2026
@engine-flutter-autorollengine-flutter-autoroll mentioned this pull request Apr 3, 2026
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 3, 2026
@engine-flutter-autoroll
adeb35f9b Fix wide gamut macos integration test (flutter/flutter#184427)
9ba0da2
auto-submitBot pushed a commit to flutter/packages that referenced this pull request Apr 3, 2026
@engine-flutter-autoroll
Roll Flutter from 0f401eea0439 to 7245c3f71104 (25 revisions) (#11427)
a95e1c3
flutter/flutter@0f401ee...7245c3f
2026-04-03 engine-flutter-autoroll@skia.org Roll Skia from c07c67045b6d to 5d847ba5c4aa (1 revision) (flutter/flutter#184570)
2026-04-03 engine-flutter-autoroll@skia.org Roll Dart SDK from 3c7a79045b8b to 46f49142acd9 (1 revision) (flutter/flutter#184567)
2026-04-03 engine-flutter-autoroll@skia.org Roll ICU from ee5f27adc28b to ff7995a708a1 (5 revisions) (flutter/flutter#184566)
2026-04-03 engine-flutter-autoroll@skia.org Roll Skia from 9ae8231be181 to c07c67045b6d (4 revisions) (flutter/flutter#184562)
2026-04-03 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from BFLjk6Uwd0gs_Hkdk... to PpL3Bn2YMb2h9LbdK... (flutter/flutter#184556)
2026-04-03 engine-flutter-autoroll@skia.org Roll Skia from 0566b2f5f0d1 to 9ae8231be181 (1 revision) (flutter/flutter#184547)
2026-04-03 engine-flutter-autoroll@skia.org Roll Dart SDK from 6008eaddd589 to 3c7a79045b8b (3 revisions) (flutter/flutter#184551)
2026-04-03 evanwall@buffalo.edu Fix wide gamut macos integration test (flutter/flutter#184427)
2026-04-02 jakemac@google.com forward an application name to DDS (flutter/flutter#184459)
2026-04-02 engine-flutter-autoroll@skia.org Roll Skia from 973117cfa875 to 0566b2f5f0d1 (8 revisions) (flutter/flutter#184534)
2026-04-02 97480502+b-luk@users.noreply.github.com Support different joins for stroked rects in uber_sdf, fix incorrect aa (flutter/flutter#184395)
2026-04-02 bkonyi@google.com [ Widget Preview ] Handle collections and records in custom preview annotations (flutter/flutter#184518)
2026-04-02 47866232+chunhtai@users.noreply.github.com Moves android_semantics_integration_test out of staging (flutter/flutter#184079)
2026-04-02 engine-flutter-autoroll@skia.org Roll Packages from b3fcf14 to 66bf7ec (4 revisions) (flutter/flutter#184514)
2026-04-02 rmolivares@renzo-olivares.dev Fix line breaks being lost when copying after selection gesture in SelectableRegion (flutter/flutter#184421)
2026-04-02 15619084+vashworth@users.noreply.github.com Add plugin version to SwiftPM package symlink directory (flutter/flutter#183668)
2026-04-02 34871572+gmackall@users.noreply.github.com Add our own wrapper for `CommonExtension` due to change in signature from 8.x->9.0 (flutter/flutter#184433)
2026-04-02 dbebawy@users.noreply.github.com [Android] Use EdgeToEdge.enable/WindowCompat for edge-to-edge mode instead of deprecated View flags (flutter/flutter#183072)
2026-04-02 dacoharkes@google.com [data_assets] Cleanup tests (flutter/flutter#184209)
2026-04-02 okorohelijah@google.com Enable SPM by default on Stable (flutter/flutter#184495)
2026-04-02 engine-flutter-autoroll@skia.org Roll Dart SDK from d84bdfeb45eb to 6008eaddd589 (2 revisions) (flutter/flutter#184513)
2026-04-02 victorsanniay@gmail.com Reland "Even more awaits" (flutter/flutter#184467)
2026-04-02 engine-flutter-autoroll@skia.org Roll Skia from bb9fd8653739 to 973117cfa875 (2 revisions) (flutter/flutter#184498)
2026-04-02 bkonyi@google.com [ Widget Preview ] Use analysis server for widget preview detection (flutter/flutter#184473)
2026-04-02 srawlins@google.com [web_ui] Fix avoid_type_to_string lint violation (flutter/flutter#184342)
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
is aware of the problem.
To file a bug in Packages: 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
mbcorona pushed a commit to mbcorona/flutter that referenced this pull request Apr 15, 2026
@walley892@mbcorona
Fix wide gamut macos integration test (flutter#184427)
6227e0b
Fixesflutter#182589.
CI machines don't have physical monitors, and the default virtual screen
given by MacOS doesn't report wide gamut support. This caused the check
in
https://github.com/flutter/flutter/blob/413244e157d7713a37ebcd892630c5bd5f6d4d30/engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm#L808
to downgrade the color mode for the tests to sRGB, even though the
hardware supports wide-gamut.
This change overrides `updateWideGamutForScreen` to always enable wide
gamut for this test in CI.
This change also updates .ci.yaml to ensure that this test runs on Apple
Silicon hardware
## Pre-launch Checklist
- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [AI contribution guidelines] and understand my
responsibilities, or I am not using AI tools.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [x] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [x] All existing and new tests are passing.
creatorpiyush pushed a commit to creatorpiyush/packages that referenced this pull request Jun 10, 2026
@engine-flutter-autoroll
Roll Flutter from 0f401eea0439 to 7245c3f71104 (25 revisions) (flutte…
7db53f4
…r#11427)
flutter/flutter@0f401ee...7245c3f
2026-04-03 engine-flutter-autoroll@skia.org Roll Skia from c07c67045b6d to 5d847ba5c4aa (1 revision) (flutter/flutter#184570)
2026-04-03 engine-flutter-autoroll@skia.org Roll Dart SDK from 3c7a79045b8b to 46f49142acd9 (1 revision) (flutter/flutter#184567)
2026-04-03 engine-flutter-autoroll@skia.org Roll ICU from ee5f27adc28b to ff7995a708a1 (5 revisions) (flutter/flutter#184566)
2026-04-03 engine-flutter-autoroll@skia.org Roll Skia from 9ae8231be181 to c07c67045b6d (4 revisions) (flutter/flutter#184562)
2026-04-03 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from BFLjk6Uwd0gs_Hkdk... to PpL3Bn2YMb2h9LbdK... (flutter/flutter#184556)
2026-04-03 engine-flutter-autoroll@skia.org Roll Skia from 0566b2f5f0d1 to 9ae8231be181 (1 revision) (flutter/flutter#184547)
2026-04-03 engine-flutter-autoroll@skia.org Roll Dart SDK from 6008eaddd589 to 3c7a79045b8b (3 revisions) (flutter/flutter#184551)
2026-04-03 evanwall@buffalo.edu Fix wide gamut macos integration test (flutter/flutter#184427)
2026-04-02 jakemac@google.com forward an application name to DDS (flutter/flutter#184459)
2026-04-02 engine-flutter-autoroll@skia.org Roll Skia from 973117cfa875 to 0566b2f5f0d1 (8 revisions) (flutter/flutter#184534)
2026-04-02 97480502+b-luk@users.noreply.github.com Support different joins for stroked rects in uber_sdf, fix incorrect aa (flutter/flutter#184395)
2026-04-02 bkonyi@google.com [ Widget Preview ] Handle collections and records in custom preview annotations (flutter/flutter#184518)
2026-04-02 47866232+chunhtai@users.noreply.github.com Moves android_semantics_integration_test out of staging (flutter/flutter#184079)
2026-04-02 engine-flutter-autoroll@skia.org Roll Packages from b3fcf14 to 66bf7ec (4 revisions) (flutter/flutter#184514)
2026-04-02 rmolivares@renzo-olivares.dev Fix line breaks being lost when copying after selection gesture in SelectableRegion (flutter/flutter#184421)
2026-04-02 15619084+vashworth@users.noreply.github.com Add plugin version to SwiftPM package symlink directory (flutter/flutter#183668)
2026-04-02 34871572+gmackall@users.noreply.github.com Add our own wrapper for `CommonExtension` due to change in signature from 8.x->9.0 (flutter/flutter#184433)
2026-04-02 dbebawy@users.noreply.github.com [Android] Use EdgeToEdge.enable/WindowCompat for edge-to-edge mode instead of deprecated View flags (flutter/flutter#183072)
2026-04-02 dacoharkes@google.com [data_assets] Cleanup tests (flutter/flutter#184209)
2026-04-02 okorohelijah@google.com Enable SPM by default on Stable (flutter/flutter#184495)
2026-04-02 engine-flutter-autoroll@skia.org Roll Dart SDK from d84bdfeb45eb to 6008eaddd589 (2 revisions) (flutter/flutter#184513)
2026-04-02 victorsanniay@gmail.com Reland "Even more awaits" (flutter/flutter#184467)
2026-04-02 engine-flutter-autoroll@skia.org Roll Skia from bb9fd8653739 to 973117cfa875 (2 revisions) (flutter/flutter#184498)
2026-04-02 bkonyi@google.com [ Widget Preview ] Use analysis server for widget preview detection (flutter/flutter#184473)
2026-04-02 srawlins@google.com [web_ui] Fix avoid_type_to_string lint violation (flutter/flutter#184342)
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
is aware of the problem.
To file a bug in Packages: 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@eyebrowsoffireeyebrowsoffireeyebrowsoffire approved these changes
@gaaclarkegaaclarkegaaclarke left review comments
+1 more reviewer
@gemini-code-assistgemini-code-assist[bot]gemini-code-assist[bot] left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

a: desktopRunning on desktopCICDRun CI/CD

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Mac wide_gamut_macos is failing: Unsupported pixel format: MTLPixelFormatBGRA8Unorm

3 participants

@walley892@eyebrowsoffire@gaaclarke