Revert "Code cleanup on destructors (flutter#16481)"

This reverts commit 8f2cbb3.

Author: NoamDev

shell/platform/windows/testing/win32_flutter_window_test.cc

@@ -1,4 +1,5 @@
 #include "flutter/shell/platform/windows/testing/win32_flutter_window_test.h"
+#include <iostream>
 
 namespace flutter {
 namespace testing {

shell/platform/windows/testing/win32_flutter_window_test.h

@@ -14,7 +14,7 @@ class Win32FlutterWindowTest : public Win32FlutterWindow {
  public:
   Win32FlutterWindowTest(int width, int height);
 
-  virtual ~Win32FlutterWindowTest();
+  ~Win32FlutterWindowTest();
 
   // |Win32Window|
   void OnFontChange() override;

shell/platform/windows/win32_flutter_window.cc

@@ -4,7 +4,7 @@
 
 namespace flutter {
 
-// The Windows DPI system is based on this
+// the Windows DPI system is based on this
 // constant for machines running at 100% scaling.
 constexpr int base_dpi = 96;
 
@@ -15,6 +15,7 @@ Win32FlutterWindow::Win32FlutterWindow(int width, int height) {
 
 Win32FlutterWindow::~Win32FlutterWindow() {
   DestroyRenderSurface();
+  Win32Window::Destroy();
 }
 
 FlutterDesktopViewControllerRef Win32FlutterWindow::CreateWin32FlutterWindow(
@@ -176,6 +177,10 @@ void Win32FlutterWindow::OnScroll(double delta_x, double delta_y) {
   }
 }
 
+void Win32FlutterWindow::OnClose() {
+  messageloop_running_ = false;
+}
+
 void Win32FlutterWindow::OnFontChange() {
   if (engine_ == nullptr) {
     return;
@@ -353,4 +358,5 @@ void Win32FlutterWindow::DestroyRenderSurface() {
   }
   render_surface = EGL_NO_SURFACE;
 }
+
 }  // namespace flutter

shell/platform/windows/win32_flutter_window.h

@@ -33,7 +33,7 @@ class Win32FlutterWindow : public Win32Window {
   // Create flutter Window for use as child window
   Win32FlutterWindow(int width, int height);
 
-  virtual ~Win32FlutterWindow();
+  ~Win32FlutterWindow();
 
   static FlutterDesktopViewControllerRef CreateWin32FlutterWindow(int width,
                                                                   int height);
@@ -65,6 +65,9 @@ class Win32FlutterWindow : public Win32Window {
   // |Win32Window|
   void OnScroll(double delta_x, double delta_y) override;
 
+  // |Win32Window|
+  void OnClose() override;
+
   // |Win32Window|
   void OnFontChange() override;
 
@@ -82,6 +85,9 @@ class Win32FlutterWindow : public Win32Window {
   // Create a surface for Flutter engine to render into.
   void CreateRenderSurface();
 
+  // Destroy current rendering surface if one has been allocated.
+  void DestroyRenderSurface();
+
   // Callbacks for clearing context, settings context and swapping buffers.
   bool ClearContext();
   bool MakeCurrent();
@@ -93,9 +99,6 @@ class Win32FlutterWindow : public Win32Window {
   void SendWindowMetrics();
 
  private:
-  // Destroy current rendering surface if one has been allocated.
-  void DestroyRenderSurface();
-
   // Reports a mouse movement to Flutter engine.
   void SendPointerMove(double x, double y);
 
@@ -171,6 +174,9 @@ class Win32FlutterWindow : public Win32Window {
 
   // should we forword input messages or not
   bool process_events_ = false;
+
+  // flag indicating if the message loop should be running
+  bool messageloop_running_ = false;
 };
 
 }  // namespace flutter

shell/platform/windows/win32_window.cc

@@ -112,6 +112,10 @@ Win32Window::MessageHandler(HWND hwnd,
       case kWmDpiChangedBeforeParent:
         return HandleDpiChange(window_handle_, wparam, lparam, false);
         break;
+      case WM_DESTROY:
+        window->OnClose();
+        return 0;
+        break;
       case WM_SIZE:
         width = LOWORD(lparam);
         height = HIWORD(lparam);

shell/platform/windows/win32_window.h

@@ -37,7 +37,7 @@ struct MouseState {
 class Win32Window {
  public:
   Win32Window();
-  virtual ~Win32Window();
+  ~Win32Window();
 
   // Initializes as a child window with size using |width| and |height| and
   // |title| to identify the windowclass.  Does not show window, window must be
@@ -46,6 +46,9 @@ class Win32Window {
                        unsigned int width,
                        unsigned int height);
 
+  // Release OS resources asociated with window.
+  virtual void Destroy();
+
   HWND GetWindowHandle();
 
  protected:
@@ -113,6 +116,9 @@ class Win32Window {
   // Called when mouse scrollwheel input occurs.
   virtual void OnScroll(double delta_x, double delta_y) = 0;
 
+  // Called when the user closes the Windows.
+  virtual void OnClose() = 0;
+
   // Called when the system font change.
   virtual void OnFontChange() = 0;
 
@@ -144,9 +150,6 @@ class Win32Window {
   void SetMouseButtons(uint64_t buttons) { mouse_state_.buttons = buttons; }
 
  private:
-  // Release OS resources asociated with window.
-  void Destroy();
-
   // Activates tracking for a "mouse leave" event.
   void TrackMouseLeaveEvent(HWND hwnd);
 

shell/platform/windows/win32_window_unittests.cc

@@ -15,6 +15,7 @@ TEST(Win32FlutterWindowTest, CanFontChange) {
   LRESULT result = SendMessage(hwnd, WM_FONTCHANGE, NULL, NULL);
   ASSERT_EQ(result, 0);
   ASSERT_TRUE(window.OnFontChangeWasCalled());
+  ASSERT_TRUE(TRUE);
 }
 
 }  // namespace testing