wm: Update a lot of code to use structs from geometry.h.

geometry.h

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WINDOW_MANAGER_GEOMETRY_H_
 #define WINDOW_MANAGER_GEOMETRY_H_
 
 #include <algorithm>
 #include <iosfwd>
 
@@ skipping 38 matching lines @@
 
 struct Size {
   Size() : width(0), height(0) {}
   Size(int width, int height) : width(width), height(height) {}
 
   void reset(int new_width, int new_height) {
     width = new_width;
     height = new_height;
   }
 
+  bool empty() const { return width <= 0 || height <= 0; }
+  int area() const { return empty() ? 0 : width * height; }
+
   bool operator==(const Size& o) const {
     return width == o.width && height == o.height;
   }
   bool operator!=(const Size& o) const {
     return width != o.width || height != o.height;
   }
 
   int width;
   int height;
 };
@@ skipping 59 matching lines @@
     }
 
     int max_x = std::min(x + width, other.x + other.width);
     x = std::max(x, other.x);
     width = std::max(0, max_x - x);
     int max_y = std::min(y + height, other.y + other.height);
     y = std::max(y, other.y);
     height = std::max(0, max_y - y);
   }
 
+  bool contains_point(const Point& point) const {
+    return point.x >= x &&
+           point.x < x + width &&
+           point.y >= y &&
+           point.y < y + height;
+  }
+
   bool operator==(const Rect& o) const {
     return x == o.x && y == o.y && width == o.width && height == o.height;
   }
   bool operator!=(const Rect& o) const {
     return x != o.x || y != o.y || width != o.width || height != o.height;
   }
 
   int left() const { return x; }
   int top() const { return y; }
   int right() const { return x + width; }
   int bottom() const { return y + height; }
 
   int x;
   int y;
   int width;
   int height;
 };
 
 }  // namespace window_manager
 
 std::ostream& operator<<(std::ostream& out, const window_manager::Point& point);
 std::ostream& operator<<(std::ostream& out, const window_manager::Size& size);
 std::ostream& operator<<(std::ostream& out, const window_manager::Rect& rect);
 
 #endif  // WINDOW_MANAGER_GEOMETRY_H_