This repository was archived by the owner on Feb 25, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6k
[web] Preserve correct CanvasKit Variant during test initialization #43854
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
harryterkelsen
approved these changes
Jul 20, 2023
Contributor
harryterkelsen
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Jul 20, 2023
ditman
reviewed
Jul 20, 2023
| }) as engine.JsFlutterConfiguration); | ||
| final engine.FlutterConfiguration config = engine.configuration.merge( | ||
| js_util.jsify(<String, Object?>{ | ||
| 'useColorEmoji': true, |
Member
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it'd been much easier to pass useColorEmoji: true on the window.flutterConfiguration JS object of the test_platform.dart?
That way the value would be read as part of the default egine configuration (since it seems that it's being applied to all tests anyway?)
I can try a PR later if you want!
auto-submit bot
pushed a commit
to flutter/flutter
that referenced
this pull request
Jul 20, 2023
…131010) flutter/engine@a3fc185...062079b 2023-07-20 [email protected] More validation logs for CommandEncoderVK submission (flutter/engine#43859) 2023-07-20 [email protected] Roll Dart SDK from 857c9a2ae14a to 1df95f328d0c (1 revision) (flutter/engine#43858) 2023-07-20 [email protected] [web] Preserve correct CanvasKit Variant during test initialization (flutter/engine#43854) 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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
ditman
added a commit
to ditman/flutter-engine
that referenced
this pull request
Jul 20, 2023
…zation (flutter#43854)" This reverts commit 6c224e8.
8 tasks
harryterkelsen
pushed a commit
to harryterkelsen/engine
that referenced
this pull request
Jul 20, 2023
…lutter#43854) At some point, we started setting `useColorEmoji` to true in our tests, but we were doing it in a way that resets all other configurations to their defaults. This caused the `canvasKitVariant` config to be lost and always set to the default `auto`. This PR fixes the issue and adds tests to: 1. Make sure that the CanvasKit suite always runs with a specific variant (not `auto`). 2. Make sure the given CanvasKit variant makes it all the way through to the tests. The test harness uses a backdoor (a global JS property on `window`) to communicate which canvaskit variant it's using. The test then compares that with `configuration.canvasKitVariant` to make sure they match. If they don't match, then the configuration was lost somewhere on the way. Fixes flutter/flutter#130993
auto-submit bot
pushed a commit
that referenced
this pull request
Jul 26, 2023
A ~~simpler~~ very similar version of #43854 * Makes it harder for users to accidentally remove default configuration values, while still allowing them to do so if needed (configuration is now overridden with a subset of values, rather than passing a full configuration object). * Moves `merge` from the configuration object and into the override method. * Removes a test-only configuration option: * `window._flutter_canvaskit_variant_for_test_only` [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
LouiseHsu
pushed a commit
to LouiseHsu/flutter
that referenced
this pull request
Jul 31, 2023
…lutter#131010) flutter/engine@a3fc185...062079b 2023-07-20 [email protected] More validation logs for CommandEncoderVK submission (flutter/engine#43859) 2023-07-20 [email protected] Roll Dart SDK from 857c9a2ae14a to 1df95f328d0c (1 revision) (flutter/engine#43858) 2023-07-20 [email protected] [web] Preserve correct CanvasKit Variant during test initialization (flutter/engine#43854) 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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
gaaclarke
pushed a commit
to gaaclarke/engine
that referenced
this pull request
Aug 30, 2023
A ~~simpler~~ very similar version of flutter#43854 * Makes it harder for users to accidentally remove default configuration values, while still allowing them to do so if needed (configuration is now overridden with a subset of values, rather than passing a full configuration object). * Moves `merge` from the configuration object and into the override method. * Removes a test-only configuration option: * `window._flutter_canvaskit_variant_for_test_only` [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
autosubmit
Merge PR when tree becomes green via auto submit App
platform-web
Code specifically for the web engine
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.
At some point, we started setting
useColorEmojito true in our tests, but we were doing it in a way that resets all other configurations to their defaults. This caused thecanvasKitVariantconfig to be lost and always set to the defaultauto.This PR fixes the issue and adds tests to:
auto).The test harness uses a backdoor (a global JS property on
window) to communicate which canvaskit variant it's using. The test then compares that withconfiguration.canvasKitVariantto make sure they match. If they don't match, then the configuration was lost somewhere on the way.Fixes flutter/flutter#130993