Wayland support for views. views_desktop on Wayland.

ui/gfx/rect.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "ui/gfx/rect.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_MACOSX)
 #include <CoreGraphics/CGGeometry.h>
-#elif defined(OS_POSIX)
+#elif defined(USE_X11)
 #include <gdk/gdk.h>
 #endif
+#if defined(USE_WAYLAND)
+#include <cairo.h>
+#endif
 
 #include <ostream>
 
 #include "ui/gfx/insets.h"
 
 namespace {
 
 void AdjustAlongAxis(int dst_origin, int dst_size, int* origin, int* size) {
   if (*origin < dst_origin) {
     *origin = dst_origin;
@@ skipping 46 matching lines @@
   set_width(r.size.width);
   set_height(r.size.height);
 }
 
 Rect& Rect::operator=(const CGRect& r) {
   origin_.SetPoint(r.origin.x, r.origin.y);
   set_width(r.size.width);
   set_height(r.size.height);
   return *this;
 }
-#elif defined(OS_POSIX)
+#elif defined(USE_X11)
 Rect::Rect(const GdkRectangle& r)
     : origin_(r.x, r.y) {
   set_width(r.width);
   set_height(r.height);
 }
 
 Rect& Rect::operator=(const GdkRectangle& r) {
   origin_.SetPoint(r.x, r.y);
   set_width(r.width);
   set_height(r.height);
   return *this;
 }
 #endif
+#if defined(USE_WAYLAND)
+Rect::Rect(const cairo_rectangle_int_t& r)
+    : origin_(r.x, r.y) {
+  set_width(r.width);
+  set_height(r.height);
+}
+
+Rect& Rect::operator=(const cairo_rectangle_int_t& r) {
+  origin_.SetPoint(r.x, r.y);
+  set_width(r.width);
+  set_height(r.height);
+  return *this;
+}
+#endif
 
+
 void Rect::SetRect(int x, int y, int width, int height) {
   origin_.SetPoint(x, y);
   set_width(width);
   set_height(height);
 }
 
 void Rect::Inset(const gfx::Insets& insets) {
   Inset(insets.left(), insets.top(), insets.right(), insets.bottom());
 }
 
@@ skipping 29 matching lines @@
   r.left = x();
   r.right = right();
   r.top = y();
   r.bottom = bottom();
   return r;
 }
 #elif defined(OS_MACOSX)
 CGRect Rect::ToCGRect() const {
   return CGRectMake(x(), y(), width(), height());
 }
-#elif defined(OS_POSIX)
+#elif defined(USE_X11)
 GdkRectangle Rect::ToGdkRectangle() const {
   GdkRectangle r = {x(), y(), width(), height()};
   return r;
 }
 #endif
+#if defined(USE_WAYLAND)
+cairo_rectangle_int_t Rect::ToCairoRectangle() const {
+  cairo_rectangle_int_t r = {x(), y(), width(), height()};
+  return r;
+}
+#endif
 
 bool Rect::Contains(int point_x, int point_y) const {
   return (point_x >= x()) && (point_x < right()) &&
          (point_y >= y()) && (point_y < bottom());
 }
 
 bool Rect::Contains(const Rect& rect) const {
   return (rect.x() >= x() && rect.right() <= right() &&
           rect.y() >= y() && rect.bottom() <= bottom());
 }
@@ skipping 87 matching lines @@
              (x() == rect.right() || right() == rect.x())) ||
          (x() == rect.x() && width() == rect.width() &&
              (y() == rect.bottom() || bottom() == rect.y()));
 }
 
 std::ostream& operator<<(std::ostream& out, const gfx::Rect& r) {
   return out << r.origin() << " " << r.size();
 }
 
 }  // namespace gfx