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

x11/mock_x_connection.cc

 // 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.
 
 #include "window_manager/x11/mock_x_connection.h"
 
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <list>
@@ skipping 409 matching lines @@
   return true;
 }
 
 bool MockXConnection::GetWindowBoundingRegion(XWindow xid, ByteMap* bytemap) {
   WindowInfo* info = GetWindowInfo(xid);
   if (!info)
     return false;
   if (info->shape.get())
     bytemap->Copy(*(info->shape.get()));
   else
-    bytemap->SetRectangle(0, 0, info->bounds.width, info->bounds.height, 0xff);
+    bytemap->SetRectangle(
+        Rect(0, 0, info->bounds.width, info->bounds.height), 0xff);
   return true;
 }
 
 bool MockXConnection::SetWindowBoundingRegionToRect(XWindow xid,
                                                     const Rect& region) {
   WindowInfo* info = GetWindowInfo(xid);
   if (!info)
     return false;
   if (region.x == 0 && region.y == 0 &&
       region.width == info->bounds.width &&
       region.height == info->bounds.height) {
     info->shape.reset(NULL);
   } else {
     if (info->shape.get() == NULL)
-      info->shape.reset(new ByteMap(info->bounds.width, info->bounds.height));
+      info->shape.reset(new ByteMap(info->bounds.size()));
     info->shape->Clear(0);
-    info->shape->SetRectangle(
-        region.x, region.y, region.width, region.height, 0xff);
+    info->shape->SetRectangle(region, 0xff);
   }
   return true;
 }
 
 bool MockXConnection::RemoveWindowBoundingRegion(XWindow xid) {
   WindowInfo* info = GetWindowInfo(xid);
   if (!info)
     return false;
   if (info->shape.get() == NULL)
-    info->shape.reset(new ByteMap(info->bounds.width, info->bounds.height));
+    info->shape.reset(new ByteMap(info->bounds.size()));
   info->shape->Clear(0);
   return true;
 }
 
 bool MockXConnection::SelectRandREventsOnWindow(XWindow xid) {
   WindowInfo* info = GetWindowInfo(xid);
   if (!info)
     return false;
   info->randr_events_selected = true;
   return true;
@@ skipping 587 matching lines @@
     queued_events_.pop();
 
   if (connection_pipe_has_data_) {
     unsigned char data = 0;
     PCHECK(HANDLE_EINTR(read(connection_pipe_fds_[0], &data, 1)) == 1);
     connection_pipe_has_data_ = false;
   }
 }
 
 }  // namespace window_manager