chromeos: converts WindowResizer to aura::Window

ash/wm/window_resizer.cc

 // Copyright (c) 2012 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/wm/window_resizer.h"
 
 #include "ash/wm/root_window_finder.h"
 #include "ash/wm/window_positioning_utils.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm_window.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
 namespace {
 
 // Returns true for resize components along the right edge, where a drag in
 // positive x will make the window larger.
 bool IsRightEdge(int window_component) {
   return window_component == HTTOPRIGHT || window_component == HTRIGHT ||
          window_component == HTBOTTOMRIGHT || window_component == HTGROWBOX;
@@ skipping 70 matching lines @@
     case HTRIGHT:
     case HTLEFT:
       pos_change_direction |= WindowResizer::kBoundsChangeDirection_Horizontal;
       break;
     default:
       break;
   }
   return pos_change_direction;
 }
 
+aura::Window* WindowResizer::GetTarget() const {
+  return window_state_ ? window_state_->window()->aura_window() : nullptr;
+}
+
 gfx::Rect WindowResizer::CalculateBoundsForDrag(
     const gfx::Point& passed_location) {
   if (!details().is_resizable)
     return details().initial_bounds_in_parent;
 
   gfx::Point location = passed_location;
   int delta_x = location.x() - details().initial_location_in_parent.x();
   int delta_y = location.y() - details().initial_location_in_parent.y();
 
   AdjustDeltaForTouchResize(&delta_x, &delta_y);
 
   // The minimize size constraint may limit how much we change the window
   // position.  For example, dragging the left edge to the right should stop
   // repositioning the window when the minimize size is reached.
   gfx::Size size = GetSizeForDrag(&delta_x, &delta_y);
   gfx::Point origin = GetOriginForDrag(delta_x, delta_y);
   gfx::Rect new_bounds(origin, size);
 
   // Sizing has to keep the result on the screen. Note that this correction
   // has to come first since it might have an impact on the origin as well as
   // on the size.
   if (details().bounds_change & kBoundsChange_Resizes) {
-    gfx::Rect work_area = GetTarget()->GetDisplayNearestWindow().work_area();
-    work_area = GetTarget()->GetParent()->ConvertRectFromScreen(work_area);
+    gfx::Rect work_area = display::Screen::GetScreen()
+                              ->GetDisplayNearestWindow(GetTarget())
+                              .work_area();
+    ::wm::ConvertRectFromScreen(GetTarget()->parent(), &work_area);
     if (details().size_change_direction & kBoundsChangeDirection_Horizontal) {
       if (IsRightEdge(details().window_component) &&
           new_bounds.right() < work_area.x() + wm::kMinimumOnScreenArea) {
         int delta =
             work_area.x() + wm::kMinimumOnScreenArea - new_bounds.right();
         new_bounds.set_width(new_bounds.width() + delta);
       } else if (new_bounds.x() >
                  work_area.right() - wm::kMinimumOnScreenArea) {
         int width =
             new_bounds.right() - work_area.right() + wm::kMinimumOnScreenArea;
@@ skipping 33 matching lines @@
       // be still hit by the cursor.
       if (details().initial_location_in_parent.x() >
           details().initial_bounds_in_parent.x() +
               details().restore_bounds.width())
         new_bounds.set_x(location.x() - details().restore_bounds.width() / 2);
     }
 
     // Make sure that |new_bounds| doesn't leave any of the displays.  Note that
     // the |work_area| above isn't good for this check since it is the work area
     // for the current display but the window can move to a different one.
-    WmWindow* parent = GetTarget()->GetParent();
-    gfx::Point passed_location_in_screen(
-        parent->ConvertPointToScreen(passed_location));
+    aura::Window* parent = GetTarget()->parent();
+    gfx::Point passed_location_in_screen(passed_location);
+    ::wm::ConvertPointToScreen(parent, &passed_location_in_screen);
     gfx::Rect near_passed_location(passed_location_in_screen, gfx::Size());
     // Use a pointer location (matching the logic in DragWindowResizer) to
     // calculate the target display after the drag.
     const display::Display& display =
         display::Screen::GetScreen()->GetDisplayMatching(near_passed_location);
     gfx::Rect screen_work_area = display.work_area();
     screen_work_area.Inset(wm::kMinimumOnScreenArea, 0);
-    gfx::Rect new_bounds_in_screen = parent->ConvertRectToScreen(new_bounds);
+    gfx::Rect new_bounds_in_screen(new_bounds);
+    ::wm::ConvertRectToScreen(parent, &new_bounds_in_screen);
     if (!screen_work_area.Intersects(new_bounds_in_screen)) {
       // Make sure that the x origin does not leave the current display.
       new_bounds_in_screen.set_x(std::max(
           screen_work_area.x() - new_bounds.width(),
           std::min(screen_work_area.right(), new_bounds_in_screen.x())));
-      new_bounds = parent->ConvertRectFromScreen(new_bounds_in_screen);
+      new_bounds = new_bounds_in_screen;
+      ::wm::ConvertRectFromScreen(parent, &new_bounds);
     }
   }
 
   return new_bounds;
 }
 
 // static
 bool WindowResizer::IsBottomEdge(int window_component) {
   return window_component == HTBOTTOMLEFT || window_component == HTBOTTOM ||
          window_component == HTBOTTOMRIGHT || window_component == HTGROWBOX;
@@ skipping 33 matching lines @@
       origin.Offset(delta_x, 0);
     if (pos_change_direction & kBoundsChangeDirection_Vertical)
       origin.Offset(0, delta_y);
   }
   return origin;
 }
 
 gfx::Size WindowResizer::GetSizeForDrag(int* delta_x, int* delta_y) {
   gfx::Size size = details().initial_bounds_in_parent.size();
   if (details().bounds_change & kBoundsChange_Resizes) {
-    gfx::Size min_size = GetTarget()->GetMinimumSize();
+    gfx::Size min_size = GetTarget()->delegate()->GetMinimumSize();

[msw, 2017/05/22 19:26:12]

ditto test q, and could delegate() be null here? (and below 293 & 325)

[sky, 2017/05/22 19:50:59]

I was assuming this code would never hit if not resizable, but I'm not sure that
is a valid assumption. Updated.

     size.SetSize(GetWidthForDrag(min_size.width(), delta_x),
                  GetHeightForDrag(min_size.height(), delta_y));
   } else if (!details().restore_bounds.IsEmpty()) {
     size = details().restore_bounds.size();
   }
   return size;
 }
 
 int WindowResizer::GetWidthForDrag(int min_width, int* delta_x) {
   int width = details().initial_bounds_in_parent.width();
   if (details().size_change_direction & kBoundsChangeDirection_Horizontal) {
     // Along the right edge, positive delta_x increases the window size.
     int x_multiplier = IsRightEdge(details().window_component) ? 1 : -1;
     width += x_multiplier * (*delta_x);
 
     // Ensure we don't shrink past the minimum width and clamp delta_x
     // for the window origin computation.
     if (width < min_width) {
       width = min_width;
       *delta_x = -x_multiplier *
                  (details().initial_bounds_in_parent.width() - min_width);
     }
 
     // And don't let the window go bigger than the display.
-    int max_width = GetTarget()->GetDisplayNearestWindow().bounds().width();
-    gfx::Size max_size = GetTarget()->GetMaximumSize();
+    int max_width = display::Screen::GetScreen()
+                        ->GetDisplayNearestWindow(GetTarget())
+                        .bounds()
+                        .width();
+    gfx::Size max_size = GetTarget()->delegate()->GetMaximumSize();
     if (max_size.width() != 0)
       max_width = std::min(max_width, max_size.width());
     if (width > max_width) {
       width = max_width;
       *delta_x = -x_multiplier *
                  (details().initial_bounds_in_parent.width() - max_width);
     }
   }
   return width;
 }
 
 int WindowResizer::GetHeightForDrag(int min_height, int* delta_y) {
   int height = details().initial_bounds_in_parent.height();
   if (details().size_change_direction & kBoundsChangeDirection_Vertical) {
     // Along the bottom edge, positive delta_y increases the window size.
     int y_multiplier = IsBottomEdge(details().window_component) ? 1 : -1;
     height += y_multiplier * (*delta_y);
 
     // Ensure we don't shrink past the minimum height and clamp delta_y
     // for the window origin computation.
     if (height < min_height) {
       height = min_height;
       *delta_y = -y_multiplier *
                  (details().initial_bounds_in_parent.height() - min_height);
     }
 
     // And don't let the window go bigger than the display.
-    int max_height = GetTarget()->GetDisplayNearestWindow().bounds().height();
-    gfx::Size max_size = GetTarget()->GetMaximumSize();
+    int max_height = display::Screen::GetScreen()
+                         ->GetDisplayNearestWindow(GetTarget())
+                         .bounds()
+                         .height();
+    gfx::Size max_size = GetTarget()->delegate()->GetMaximumSize();
     if (max_size.height() != 0)
       max_height = std::min(max_height, max_size.height());
     if (height > max_height) {
       height = max_height;
       *delta_y = -y_multiplier *
                  (details().initial_bounds_in_parent.height() - max_height);
     }
   }
   return height;
 }
 
 }  // namespace ash