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

[engine] make UI thread the platform thread for Android. Still allows opt out as g3 escape hatch. #55111

Merged
merged 1 commit into from
Sep 12, 2024
Merged

[engine] make UI thread the platform thread for Android. Still allows opt out as g3 escape hatch. #55111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ struct Settings {

// If true, the UI thread is the platform thread on supported
// platforms.
bool merged_platform_ui_thread = false;
bool merged_platform_ui_thread = true;
Copy link
Contributor Author

@jonahwilliams jonahwilliams Sep 11, 2024

Choose a reason for hiding this comment

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

Note: this is only used by android now. Can be removed in a few weeks.


// Log a warning during shell initialization if Impeller is not enabled.
bool warn_on_impeller_opt_out = false;
Expand Down
2 changes: 0 additions & 2 deletions shell/platform/android/android_shell_holder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,6 @@ AndroidShellHolder::AndroidShellHolder(
fml::MessageLoop::GetCurrent().GetTaskRunner();
raster_runner = thread_host_->raster_thread->GetTaskRunner();
if (settings.merged_platform_ui_thread) {
FML_LOG(IMPORTANT)
<< "Warning: Using highly experimental merged thread mode.";
ui_runner = platform_runner;
} else {
ui_runner = thread_host_->ui_thread->GetTaskRunner();
Expand Down
8 changes: 6 additions & 2 deletions shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,12 @@ public void ensureInitializationComplete(
if (metaData.getBoolean(IMPELLER_VULKAN_GPU_TRACING_DATA_KEY, false)) {
shellArgs.add("--enable-vulkan-gpu-tracing");
}
if (metaData.getBoolean(ENABLED_MERGED_PLATFORM_UI_THREAD_KEY, false)) {
shellArgs.add("--enable-merged-platform-ui-thread");
if (metaData.containsKey(ENABLED_MERGED_PLATFORM_UI_THREAD_KEY)) {
if (metaData.getBoolean(ENABLED_MERGED_PLATFORM_UI_THREAD_KEY)) {
shellArgs.add("--enable-merged-platform-ui-thread");
} else {
shellArgs.add("--no-enable-merged-platform-ui-thread");
}
}
String backend = metaData.getString(IMPELLER_BACKEND_META_DATA_KEY);
if (backend != null) {
Expand Down
6 changes: 0 additions & 6 deletions shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,6 @@ static BOOL DoesHardwareSupportWideGamut() {
settings.enable_dart_profiling = enableDartProfiling.boolValue;
}

NSNumber* enableMergedPlatformUIThread =
Copy link
Contributor Author

@jonahwilliams jonahwilliams Sep 11, 2024

Choose a reason for hiding this comment

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

this is unused.

[mainBundle objectForInfoDictionaryKey:@"FLTEnableMergedPlatformUIThread"];
if (enableMergedPlatformUIThread != nil) {
settings.merged_platform_ui_thread = enableMergedPlatformUIThread.boolValue;
}

// Leak Dart VM settings, set whether leave or clean up the VM after the last shell shuts down.
NSNumber* leakDartVM = [mainBundle objectForInfoDictionaryKey:@"FLTLeakDartVM"];
// It will change the default leak_vm value in settings only if the key exists.
Expand Down
2 changes: 0 additions & 2 deletions shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,6 @@ - (void)testEnableSemanticsWhenFlutterViewAccessibilityDidCall {

- (void)testCanMergePlatformAndUIThread {
auto settings = FLTDefaultSettingsForBundle();
settings.merged_platform_ui_thread = true;
settings.enable_impeller = true;
FlutterDartProject* project = [[FlutterDartProject alloc] initWithSettings:settings];
FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
Expand All @@ -484,7 +483,6 @@ - (void)testCanMergePlatformAndUIThread {

- (void)testCanNotUnMergePlatformAndUIThread {
auto settings = FLTDefaultSettingsForBundle();
settings.merged_platform_ui_thread = false;
settings.enable_impeller = true;
FlutterDartProject* project = [[FlutterDartProject alloc] initWithSettings:settings];
FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
Expand Down