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

util.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_UTIL_H_
 #define WINDOW_MANAGER_UTIL_H_
 
 #include <algorithm>
 #include <ctime>
 #include <list>
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/logging.h"
 #include "base/time.h"
+#include "window_manager/geometry.h"
 
 namespace window_manager {
 
 // Stacker maintains an ordering of objects (e.g. windows) in which changes
 // can be made in faster-than-linear time.
 template<class T>
 class Stacker {
  public:
   Stacker() {}
 
@@ skipping 116 matching lines @@
   // Index into |items_|.
   IteratorMap index_;
 
   DISALLOW_COPY_AND_ASSIGN(Stacker);
 };
 
 
 // ByteMap unions rectangles into a 2-D array of bytes.  That's it. :-P
 class ByteMap {
  public:
-  ByteMap(int width, int height);
+  ByteMap(const Size& size);
   ~ByteMap();
 
-  int width() const { return width_; }
-  int height() const { return height_; }
+  const Size& size() const { return size_; }
   const unsigned char* bytes() const { return bytes_; }
 
   // Copy the bytes from |other|, which must have the same dimensions as
   // this map.
   void Copy(const ByteMap& other);
 
   // Set every byte to |value|.
   void Clear(unsigned char value);
 
   // Set the bytes covered by the passed-in rectangle.
-  void SetRectangle(int rect_x, int rect_y,
-                    int rect_width, int rect_height,
-                    unsigned char value);
+  void SetRectangle(const Rect& rect, unsigned char value);
 
   // Check if the bytes from |other| match the bytes from this.
   bool operator==(const ByteMap& other);
 
  private:
-  int width_;
-  int height_;
+  Size size_;
   unsigned char* bytes_;
 
   DISALLOW_COPY_AND_ASSIGN(ByteMap);
 };
 
 
 // Sets a variable to a value within a particular scope and resets it when
 // the scope is exited.
 // TODO: This is just a templatized version of Chrome's base/auto_reset.h.
 // Use that instead when/if it's templatized.
@@ skipping 100 matching lines @@
 //
 // The argument is not a reference because the callback code that we're
 // using from protobuf has trouble with references.
 void RunCommandInBackground(std::string command);
 
 }  // namespace util
 
 }  // namespace window_manager
 
 #endif  // WINDOW_MANAGER_UTIL_H_