Improve comments and code style consistency

Author: hbatagelo

engine/src/flutter/shell/platform/windows/flutter_host_window.cc

@@ -131,11 +131,13 @@ std::string GetLastErrorAsString() {
 }
 
 // Calculates the required window size, in physical coordinates, to
-// accommodate the given |client_size|, in logical coordinates, constrained to
-// |min_size| and |max_size|, for a window with the specified |window_style| and
-// |extended_window_style|. The result accounts for window borders, non-client
-// areas, and the drop-shadow area. On error, return std::nullopt and log the
-// error.
+// accommodate the given |client_size|, in logical coordinates, constrained by
+// optional |min_size| and |max_size|, for a window with the specified
+// |window_style| and |extended_window_style|. If |owner_hwnd| is not null, the
+// DPI of the display with the largest area of intersection with |owner_hwnd| is
+// used for the calculation; otherwise, the primary display's DPI is used. The
+// resulting size includes window borders, non-client areas, and drop shadows.
+// On error, returns std::nullopt and logs an error message.
 std::optional<flutter::Size> GetWindowSizeForClientSize(
     flutter::Size const& client_size,
     std::optional<flutter::Size> min_size,
@@ -210,7 +212,7 @@ bool IsClassRegistered(LPCWSTR class_name) {
          0;
 }
 
-// Convert std::string to std::wstring
+// Convert std::string to std::wstring.
 std::wstring StringToWstring(std::string const& str) {
   if (str.empty()) {
     return {};
@@ -280,7 +282,7 @@ FlutterHostWindow::FlutterHostWindow(FlutterHostWindowController* controller,
       FML_UNREACHABLE();
   }
 
-  // Validate size constraints
+  // Validate size constraints.
   min_size_ = settings.min_size;
   max_size_ = settings.max_size;
   if (min_size_ && max_size_) {
@@ -293,8 +295,8 @@ FlutterHostWindow::FlutterHostWindow(FlutterHostWindowController* controller,
 
   // Calculate the screen space window rectangle for the new window.
   // Default positioning values (CW_USEDEFAULT) are used
-  // if the window has no owner or positioner.
-  Rect initial_window_rect = [&]() -> Rect {
+  // if the window has no owner.
+  Rect const initial_window_rect = [&]() -> Rect {
     std::optional<Size> const window_size = GetWindowSizeForClientSize(
         settings.size, min_size_, max_size_, window_style,
         extended_window_style, nullptr);
@@ -556,7 +558,7 @@ LRESULT FlutterHostWindow::HandleMessage(HWND hwnd,
 
     case WM_SIZE: {
       if (child_content_ != nullptr) {
-        // Resize and reposition the child content window
+        // Resize and reposition the child content window.
         RECT client_rect;
         GetClientRect(hwnd, &client_rect);
         MoveWindow(child_content_, client_rect.left, client_rect.top,

engine/src/flutter/shell/platform/windows/flutter_host_window_controller.cc

@@ -51,17 +51,17 @@ std::optional<WindowMetadata> FlutterHostWindowController::CreateHostWindow(
   WindowState const state = window->GetState();
   windows_[view_id] = std::move(window);
 
-  WindowMetadata result = {.view_id = view_id,
-                           .archetype = settings.archetype,
-                           .size = GetWindowSize(view_id),
-                           .parent_id = std::nullopt,
-                           .state = state};
+  WindowMetadata const result = {.view_id = view_id,
+                                 .archetype = settings.archetype,
+                                 .size = GetWindowSize(view_id),
+                                 .parent_id = std::nullopt,
+                                 .state = state};
 
   return result;
 }
 
 bool FlutterHostWindowController::DestroyHostWindow(FlutterViewId view_id) {
-  if (auto it = windows_.find(view_id); it != windows_.end()) {
+  if (auto const it = windows_.find(view_id); it != windows_.end()) {
     FlutterHostWindow* const window = it->second.get();
     HWND const window_handle = window->GetWindowHandle();
 
@@ -75,7 +75,7 @@ bool FlutterHostWindowController::DestroyHostWindow(FlutterViewId view_id) {
 
 FlutterHostWindow* FlutterHostWindowController::GetHostWindow(
     FlutterViewId view_id) const {
-  if (auto it = windows_.find(view_id); it != windows_.end()) {
+  if (auto const it = windows_.find(view_id); it != windows_.end()) {
     return it->second.get();
   }
   return nullptr;
@@ -146,7 +146,7 @@ void FlutterHostWindowController::DestroyAllWindows() {
     // Destroy windows in reverse order of creation.
     for (auto it = std::prev(windows_.end());
          it != std::prev(windows_.begin());) {
-      auto current = it--;
+      auto const current = it--;
       auto const& [view_id, window] = *current;
       if (window->GetWindowHandle()) {
         DestroyHostWindow(view_id);

engine/src/flutter/shell/platform/windows/windowing_handler.cc

@@ -103,7 +103,7 @@ std::optional<std::vector<T>> GetListOfValuesForKeyOrSendError(
     return decoded_values;
   }
 
-  // If the value exists but is not a list
+  // If the value exists but is not a list.
   result.Error(kInvalidValueError,
                "Value for key '" + key + "' key must be an array.");
   return std::nullopt;
@@ -152,7 +152,7 @@ void WindowingHandler::HandleCreateWindow(WindowArchetype archetype,
     return;
   }
 
-  // Helper lambda to check and report invalid window size
+  // Helper lambda to check and report invalid window size.
   auto const has_valid_window_size =
       [&result](Size size, std::string_view key_name) -> bool {
     if (size.width() <= 0 || size.height() <= 0) {
@@ -167,7 +167,7 @@ void WindowingHandler::HandleCreateWindow(WindowArchetype archetype,
 
   WindowCreationSettings settings;
 
-  // Get value for the 'size' key (non-nullable)
+  // Get value for the 'size' key (non-nullable).
   auto const size_list =
       GetListOfValuesForKeyOrSendError<double, 2>(kSizeKey, map, result);
   if (!size_list) {
@@ -181,27 +181,27 @@ void WindowingHandler::HandleCreateWindow(WindowArchetype archetype,
   }
 
   if (archetype == WindowArchetype::kRegular) {
-    // Get value for the 'minSize' key (nullable)
+    // Get value for the 'minSize' key (nullable).
     if (auto const list = GetListOfValuesForKeyOrSendError<double, 2>(
             kMinSizeKey, map, result)) {
       settings.min_size = {list->at(0), list->at(1)};
       if (!has_valid_window_size(*settings.min_size, kMinSizeKey)) {
         return;
       }
     }
-    // Get value for the 'maxSize' key (nullable)
+    // Get value for the 'maxSize' key (nullable).
     if (auto const list = GetListOfValuesForKeyOrSendError<double, 2>(
             kMaxSizeKey, map, result)) {
       settings.max_size = {list->at(0), list->at(1)};
       if (!has_valid_window_size(*settings.max_size, kMaxSizeKey)) {
         return;
       }
     }
-    // Get value for the 'title' key (nullable)
+    // Get value for the 'title' key (nullable).
     settings.title =
         GetSingleValueForKeyOrSendError<std::string>(kTitleKey, map, result);
 
-    // Get value for the 'state' key (nullable)
+    // Get value for the 'state' key (nullable).
     if (std::optional<std::string> state_string =
             GetSingleValueForKeyOrSendError<std::string>(kStateKey, map,
                                                          result)) {