Read the FLTEnableImpeller flag from the right bundle #40535
Merged
Conversation
This file contains 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
jmagman
reviewed
Mar 22, 2023
| @@ -207,7 +207,7 @@ | |||
| settings.enable_wide_gamut = enableWideGamut; | |||
|
|
|||
| // Whether to enable Impeller. | |||
| NSNumber* enableImpeller = [mainBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"]; | |||
| NSNumber* enableImpeller = [bundle objectForInfoDictionaryKey:@"FLTEnableImpeller"]; | |||
There was a problem hiding this comment.
This needs to check both, right? Otherwise we will break customers who followed our instructions to add the flag to their app's Info.plist.
There was a problem hiding this comment.
Ohh. Good point. I need to take another look at this.
There was a problem hiding this comment.
Something like this:
Suggested change
| NSNumber* enableImpeller = [bundle objectForInfoDictionaryKey:@"FLTEnableImpeller"]; | |
| NSNumber* enableImpellerMainBundle = [mainBundle objectForInfoDictionaryKey:@"FLTEnableImpeller"]; | |
| NSNumber* enableImpeller = | |
| enableImpellerMainBundle != nil | |
| ? enableImpellerMainBundle | |
| : [bundle objectForInfoDictionaryKey:@"FLTEnableImpeller"]; |
There was a problem hiding this comment.
Thanks! Based on the comment above, I look in the app bundle first.
zanderso
force-pushed
the
impeller-flag-flutter-bundle
branch
from
1d6e39c
to
19166cb
Compare
jmagman
approved these changes
Mar 22, 2023
|
|
||
| auto settings = FLTDefaultSettingsForBundle(); | ||
| // Check settings.enable_impeller value is same as the value defined in Info.plist. | ||
| XCTAssertEqual(settings.enable_impeller, NO); |
There was a problem hiding this comment.
XCTAssertTrue and XCTAssertFalse are a little more idiomatic, but it's a minor nit.
Suggested change
| XCTAssertEqual(settings.enable_impeller, NO); | |
| XCTAssertFalse(settings.enable_impeller); |
There was a problem hiding this comment.
I suspect I'll be touching this file again soon, and I'll keep this in mind for a cleanup then.
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Mar 23, 2023
auto-submit bot
pushed a commit
to flutter/flutter
that referenced
this pull request
Mar 23, 2023
…ter/engine#40535) (#123306) Roll Flutter Engine from 3f9fe923b037 to cd0a6ef93263 (1 revision)
sourcegraph-bot
pushed a commit
to sgtest/megarepo
that referenced
this pull request
Mar 23, 2023
…dle (flutter/engine#40535) (#123306) Commit: c0878572badbdd67517a20076685239e6b6418c7
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Mar 23, 2023
This was referenced Mar 23, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Mar 23, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Mar 23, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Mar 23, 2023
This was referenced Mar 28, 2023
chinmaygarde
added a commit
to chinmaygarde/flutter_engine
that referenced
this pull request
Apr 3, 2023
Fixes flutter/flutter#123027. Turns out, this isn't an issue with back-grounding. This can only happen if the IO manager is torn down before worker pool has had a chance to process the decompression job, or if the UI manager was never setup. It is hard to imaging how this could happen in a real application. If it does though, we should not crash. This patch makes the change to return an error instead. The linked issue was a test environment and the failure was addressed in flutter#40535.
8 tasks
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
May 10, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
May 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR causes the
FLTEnableImpellerflag to be read first out of the application bundle, and next out of the main bundle.This is not exactly what is described in
engine/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
Line 82 in e159e35
Fixes flutter/flutter#123046