Tie lifecycle to message

Author: yaakovschectman

shell/platform/windows/fixtures/main.dart

@@ -127,6 +127,22 @@ void exitTestCancel() async {
   await exited.future;
 }
 
+@pragma('vm:entry-point')
+void enableLifecycleTest() async {
+  final Completer<ByteData?> finished = Completer<ByteData?>();
+  ui.channelBuffers.setListener('flutter/lifecycle', (ByteData? data, ui.PlatformMessageResponseCallback callback) async {
+    if (data != null) {
+      ui.PlatformDispatcher.instance.sendPlatformMessage(
+        'flutter/unittest',
+        data,
+        (ByteData? reply) {
+          finished.complete();
+        });
+    }
+  });
+  await finished.future;
+}
+
 @pragma('vm:entry-point')
 void customEntrypoint() {}
 

shell/platform/windows/flutter_windows_engine.cc

@@ -792,7 +792,7 @@ void FlutterWindowsEngine::OnDwmCompositionChanged() {
 }
 
 void FlutterWindowsEngine::OnApplicationLifecycleEnabled() {
-  lifecycle_manager_->BeginProcessingClose();
+  lifecycle_manager_->BeginProcessingLifecycle();
 }
 
 void FlutterWindowsEngine::OnWindowStateEvent(HWND hwnd,

shell/platform/windows/flutter_windows_engine_unittests.cc

@@ -1002,5 +1002,56 @@ TEST_F(FlutterWindowsEngineTest, InnerWindowHidden) {
             AppLifecycleState::kInactive);
 }
 
+TEST_F(FlutterWindowsEngineTest, EnableLifecycleState) {
+  FlutterWindowsEngineBuilder builder{GetContext()};
+  builder.SetDartEntrypoint("enableLifecycleTest");
+  bool finished = false;
+
+  auto window_binding_handler =
+      std::make_unique<::testing::NiceMock<MockWindowBindingHandler>>();
+  MockFlutterWindowsView view(std::move(window_binding_handler));
+  view.SetEngine(builder.Build());
+  FlutterWindowsEngine* engine = view.GetEngine();
+
+  EngineModifier modifier(engine);
+  modifier.embedder_api().RunsAOTCompiledDartCode = []() { return false; };
+  auto handler = std::make_unique<MockWindowsLifecycleManager>(engine);
+  ON_CALL(*handler, SetLifecycleState)
+      .WillByDefault([handler_ptr = handler.get()](AppLifecycleState state) {
+        handler_ptr->WindowsLifecycleManager::SetLifecycleState(state);
+      });
+  modifier.SetLifecycleManager(std::move(handler));
+
+  auto binary_messenger =
+      std::make_unique<BinaryMessengerImpl>(engine->messenger());
+  // Mark the test only as completed on receiving an inactive state message.
+  binary_messenger->SetMessageHandler(
+      "flutter/unittest", [&finished](const uint8_t* message,
+                                      size_t message_size, BinaryReply reply) {
+        std::string contents(message, message + message_size);
+        EXPECT_NE(contents.find("AppLifecycleState.inactive"),
+                  std::string::npos);
+        finished = true;
+        char response[] = "";
+        reply(reinterpret_cast<uint8_t*>(response), 0);
+      });
+
+  engine->Run();
+
+  // Test that setting the state before enabling lifecycle does nothing.
+  HWND hwnd = reinterpret_cast<HWND>(1);
+  view.OnWindowStateEvent(hwnd, WindowStateEvent::kShow);
+  view.OnWindowStateEvent(hwnd, WindowStateEvent::kHide);
+  EXPECT_FALSE(finished);
+
+  // Test that we can set the state afterwards.
+  engine->OnApplicationLifecycleEnabled();
+  view.OnWindowStateEvent(hwnd, WindowStateEvent::kShow);
+
+  while (!finished) {
+    engine->task_runner()->ProcessTasks();
+  }
+}
+
 }  // namespace testing
 }  // namespace flutter

shell/platform/windows/windows_lifecycle_manager.cc

@@ -14,7 +14,7 @@
 namespace flutter {
 
 WindowsLifecycleManager::WindowsLifecycleManager(FlutterWindowsEngine* engine)
-    : engine_(engine), process_close_(false) {}
+    : engine_(engine) {}
 
 WindowsLifecycleManager::~WindowsLifecycleManager() {}
 
@@ -49,7 +49,7 @@ bool WindowsLifecycleManager::WindowProc(HWND hwnd,
     // is, we re-dispatch a new WM_CLOSE message. In order to allow the new
     // message to reach other delegates, we ignore it here.
     case WM_CLOSE: {
-      if (!process_close_) {
+      if (!process_lifecycle_) {
         return false;
       }
       auto key = std::make_tuple(hwnd, wpar, lpar);
@@ -179,16 +179,16 @@ bool WindowsLifecycleManager::IsLastWindowOfProcess() {
   return num_windows <= 1;
 }
 
-void WindowsLifecycleManager::BeginProcessingClose() {
-  process_close_ = true;
+void WindowsLifecycleManager::BeginProcessingLifecycle() {
+  process_lifecycle_ = true;
 }
 
 void WindowsLifecycleManager::SetLifecycleState(AppLifecycleState state) {
   if (state_ == state) {
     return;
   }
   state_ = state;
-  if (engine_) {
+  if (engine_ && process_lifecycle_) {
     const char* state_name = AppLifecycleStateToString(state);
     engine_->SendPlatformMessage("flutter/lifecycle",
                                  reinterpret_cast<const uint8_t*>(state_name),

shell/platform/windows/windows_lifecycle_manager.h

@@ -52,8 +52,9 @@ class WindowsLifecycleManager {
   // update the application lifecycle.
   bool WindowProc(HWND hwnd, UINT msg, WPARAM w, LPARAM l, LRESULT* result);
 
-  // Signal to start consuming WM_CLOSE messages.
-  void BeginProcessingClose();
+  // Signal to start consuming WM_CLOSE messages and sending lifecycle state
+  // update messages.
+  void BeginProcessingLifecycle();
 
   // Update the app lifecycle state in response to a change in window state.
   // When the app lifecycle state actually changes, this sends a platform
@@ -100,7 +101,7 @@ class WindowsLifecycleManager {
 
   std::map<std::tuple<HWND, WPARAM, LPARAM>, int> sent_close_messages_;
 
-  bool process_close_;
+  bool process_lifecycle_ = false;
 
   std::set<HWND> visible_windows_;