AdjustBoundsToEnsureMinimumWindowVisibility may cause unwanted shift if window dimension is small

ash/common/wm/window_positioning_utils.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/wm/window_positioning_utils.h"
 
 #include <algorithm>
 
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
@@ skipping 28 matching lines @@
 void AdjustBoundsToEnsureWindowVisibility(const gfx::Rect& visible_area,
                                           int min_width,
                                           int min_height,
                                           gfx::Rect* bounds) {
   AdjustBoundsSmallerThan(visible_area.size(), bounds);
 
   min_width = std::min(min_width, visible_area.width());
   min_height = std::min(min_height, visible_area.height());
 
   if (bounds->right() < visible_area.x() + min_width) {
-    bounds->set_x(visible_area.x() + min_width - bounds->width());
+    bounds->set_x(visible_area.x() + std::min(bounds->width(), min_width) -
+                  bounds->width());
   } else if (bounds->x() > visible_area.right() - min_width) {
-    bounds->set_x(visible_area.right() - min_width);
+    bounds->set_x(visible_area.right() - std::min(bounds->width(), min_width));
   }
   if (bounds->bottom() < visible_area.y() + min_height) {
-    bounds->set_y(visible_area.y() + min_height - bounds->height());
+    bounds->set_y(visible_area.y() + std::min(bounds->height(), min_height) -
+                  bounds->height());
   } else if (bounds->y() > visible_area.bottom() - min_height) {
-    bounds->set_y(visible_area.bottom() - min_height);
+    bounds->set_y(visible_area.bottom() -
+                  std::min(bounds->height(), min_height));
   }
   if (bounds->y() < visible_area.y())
     bounds->set_y(visible_area.y());
 }
 
 void AdjustBoundsToEnsureMinimumWindowVisibility(const gfx::Rect& visible_area,
                                                  gfx::Rect* bounds) {
   AdjustBoundsToEnsureWindowVisibility(visible_area, kMinimumOnScreenArea,
                                        kMinimumOnScreenArea, bounds);
 }
@@ skipping 12 matching lines @@
                    width, work_area_in_parent.height());
 }
 
 void CenterWindow(WmWindow* window) {
   WMEvent event(WM_EVENT_CENTER);
   window->GetWindowState()->OnWMEvent(&event);
 }
 
 }  // namespace wm
 }  // namespace ash