Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only register top level window message listener upon registering service binding #41733

Merged
merged 22 commits into from
May 10, 2023
Merged

Only register top level window message listener upon registering service binding #41733

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a9edfd8
Listen for binding register
yaakovschectman May 4, 2023
248630a
Consume message on mac, linux
yaakovschectman May 4, 2023
4f72ae4
Fix typo
yaakovschectman May 4, 2023
d27058c
Fix typo
yaakovschectman May 4, 2023
3807362
Test service binding registration
yaakovschectman May 4, 2023
952520b
Formatting
yaakovschectman May 4, 2023
7dc998d
Comments
yaakovschectman May 4, 2023
559ab7b
Gate WM_CLOSE consumption
yaakovschectman May 4, 2023
748c3e5
Rename message
yaakovschectman May 4, 2023
2a7e68f
Update shell/platform/windows/flutter_windows_engine_unittests.cc
yaakovschectman May 4, 2023
ecadae4
Update shell/platform/windows/flutter_windows_engine_unittests.cc
yaakovschectman May 4, 2023
24a37cc
Feedback
yaakovschectman May 4, 2023
01409d4
TODO comments
yaakovschectman May 5, 2023
d35bf00
VS mistake
yaakovschectman May 5, 2023
47866e4
Tag gspencergoog in TODO for Linux
yaakovschectman May 5, 2023
a759f41
Tag chrome-bot
yaakovschectman May 5, 2023
621bca6
Rename method
yaakovschectman May 5, 2023
ff6af43
Rename var
yaakovschectman May 5, 2023
5368213
Cleanup null
yaakovschectman May 9, 2023
83d9d67
Formatting
yaakovschectman May 9, 2023
5047d74
Merge branch 'main' into wm_close_toplevel
yaakovschectman May 9, 2023
5e13448
Update TODO
yaakovschectman May 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions shell/platform/darwin/macos/framework/Source/FlutterEngine.mm
View file
Open in desktop
Expand Up @@ -1031,6 +1031,8 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
result(@{@"value" : @([self clipboardHasStrings])});
} else if ([call.method isEqualToString:@"System.exitApplication"]) {
[[self terminationHandler] handleRequestAppExitMethodCall:call.arguments result:result];
} else if ([call.method isEqualToString:@"System.registerBinding"]) {
result(nil);
loic-sharma marked this conversation as resolved.
Show resolved Hide resolved
} else {
result(FlutterMethodNotImplemented);
}
Expand Down
3 changes: 3 additions & 0 deletions shell/platform/linux/fl_platform_plugin.cc
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@ static constexpr char kSetClipboardDataMethod[] = "Clipboard.setData";
static constexpr char kClipboardHasStringsMethod[] = "Clipboard.hasStrings";
static constexpr char kExitApplicationMethod[] = "System.exitApplication";
static constexpr char kRequestAppExitMethod[] = "System.requestAppExit";
static constexpr char kRegisterBindingMethod[] = "System.registerBinding";
static constexpr char kPlaySoundMethod[] = "SystemSound.play";
static constexpr char kSystemNavigatorPopMethod[] = "SystemNavigator.pop";
static constexpr char kTextKey[] = "text";
Expand Down Expand Up @@ -335,6 +336,8 @@ static void method_call_cb(FlMethodChannel* channel,
response = system_sound_play(self, args);
} else if (strcmp(method, kSystemNavigatorPopMethod) == 0) {
response = system_navigator_pop(self);
} else if () {
response = FL_METHOD_RESPONSE(fl_method_success_response_new(fl_value_new_null()));
} else {
response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new());
}
Expand Down
25 changes: 14 additions & 11 deletions shell/platform/windows/flutter_windows_engine.cc
View file
Open in desktop
Expand Up @@ -204,17 +204,6 @@ FlutterWindowsEngine::FlutterWindowsEngine(
std::make_unique<FlutterWindowsTextureRegistrar>(this, gl_procs_);
surface_manager_ = AngleSurfaceManager::Create();
window_proc_delegate_manager_ = std::make_unique<WindowProcDelegateManager>();
window_proc_delegate_manager_->RegisterTopLevelWindowProcDelegate(
[](HWND hwnd, UINT msg, WPARAM wpar, LPARAM lpar, void* user_data,
LRESULT* result) {
BASE_DCHECK(user_data);
FlutterWindowsEngine* that =
static_cast<FlutterWindowsEngine*>(user_data);
BASE_DCHECK(that->lifecycle_manager_);
return that->lifecycle_manager_->WindowProc(hwnd, msg, wpar, lpar,
result);
},
static_cast<void*>(this));

// Set up internal channels.
// TODO: Replace this with an embedder.h API. See
Expand Down Expand Up @@ -778,4 +767,18 @@ void FlutterWindowsEngine::OnDwmCompositionChanged() {
view_->OnDwmCompositionChanged();
}

void FlutterWindowsEngine::OnServiceBindingsRegistered() {
yaakovschectman marked this conversation as resolved.
Show resolved Hide resolved
window_proc_delegate_manager_->RegisterTopLevelWindowProcDelegate(
[](HWND hwnd, UINT msg, WPARAM wpar, LPARAM lpar, void* user_data,
LRESULT* result) {
BASE_DCHECK(user_data);
FlutterWindowsEngine* that =
static_cast<FlutterWindowsEngine*>(user_data);
BASE_DCHECK(that->lifecycle_manager_);
return that->lifecycle_manager_->WindowProc(hwnd, msg, wpar, lpar,
result);
},
static_cast<void*>(this));
}

} // namespace flutter
4 changes: 4 additions & 0 deletions shell/platform/windows/flutter_windows_engine.h
View file
Open in desktop
Expand Up @@ -269,6 +269,10 @@ class FlutterWindowsEngine {
// Called when a WM_DWMCOMPOSITIONCHANGED message is received.
void OnDwmCompositionChanged();

// Called in response to the framework registering a ServiceBindings.
// Registers the top level handler for the WM_CLOSE window message.
void OnServiceBindingsRegistered();
Copy link
Member

Choose a reason for hiding this comment

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

Don't forget to update these names to reflect the latest framework message name :)


protected:
// Creates the keyboard key handler.
//
Expand Down
4 changes: 4 additions & 0 deletions shell/platform/windows/flutter_windows_engine_unittests.cc
View file
Open in desktop
Expand Up @@ -645,6 +645,7 @@ TEST_F(FlutterWindowsEngineTest, TestExit) {
MockFlutterWindowsView view(std::move(window_binding_handler));
view.SetEngine(builder.Build());
FlutterWindowsEngine* engine = view.GetEngine();
engine->OnServiceBindingsRegistered();
yaakovschectman marked this conversation as resolved.
Show resolved Hide resolved

EngineModifier modifier(engine);
modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
Expand Down Expand Up @@ -681,6 +682,7 @@ TEST_F(FlutterWindowsEngineTest, TestExitCancel) {
MockFlutterWindowsView view(std::move(window_binding_handler));
view.SetEngine(builder.Build());
FlutterWindowsEngine* engine = view.GetEngine();
engine->OnServiceBindingsRegistered();

EngineModifier modifier(engine);
modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
Expand Down Expand Up @@ -731,6 +733,7 @@ TEST_F(FlutterWindowsEngineTest, TestExitSecondCloseMessage) {
MockFlutterWindowsView view(std::move(window_binding_handler));
view.SetEngine(builder.Build());
FlutterWindowsEngine* engine = view.GetEngine();
engine->OnServiceBindingsRegistered();

EngineModifier modifier(engine);
modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
Expand Down Expand Up @@ -792,6 +795,7 @@ TEST_F(FlutterWindowsEngineTest, TestExitCloseMultiWindow) {
MockFlutterWindowsView view(std::move(window_binding_handler));
view.SetEngine(builder.Build());
FlutterWindowsEngine* engine = view.GetEngine();
engine->OnServiceBindingsRegistered();

EngineModifier modifier(engine);
modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
Expand Down
4 changes: 4 additions & 0 deletions shell/platform/windows/platform_handler.cc
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@ static constexpr char kHasStringsClipboardMethod[] = "Clipboard.hasStrings";
static constexpr char kSetClipboardDataMethod[] = "Clipboard.setData";
static constexpr char kExitApplicationMethod[] = "System.exitApplication";
static constexpr char kRequestAppExitMethod[] = "System.requestAppExit";
static constexpr char kRegisterBindingMethod[] = "System.registerBinding";
static constexpr char kPlaySoundMethod[] = "SystemSound.play";

static constexpr char kExitCodeKey[] = "exitCode";
Expand Down Expand Up @@ -495,6 +496,9 @@ void PlatformHandler::HandleMethodCall(
const rapidjson::Value& sound_type = method_call.arguments()[0];

SystemSoundPlay(sound_type.GetString(), std::move(result));
} else if (method.compare(kRegisterBindingMethod) == 0) {
engine_->OnServiceBindingsRegistered();
result->Success();
} else {
result->NotImplemented();
}
Expand Down