Index: ui/gfx/rect.h |
diff --git a/ui/gfx/rect.h b/ui/gfx/rect.h |
index 113647188353bf2a310c9ee738eb93f99ac2f3e3..43438258fb928be8dc7d52f2c2e1420472c0397b 100644 |
--- a/ui/gfx/rect.h |
+++ b/ui/gfx/rect.h |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// 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. |
@@ -24,10 +24,6 @@ typedef struct tagRECT RECT; |
typedef struct _GdkRectangle GdkRectangle; |
#endif |
-#if defined(USE_WAYLAND) |
-typedef struct _cairo_rectangle_int cairo_rectangle_int_t; |
-#endif |
- |
namespace gfx { |
class Insets; |
@@ -44,9 +40,6 @@ class UI_EXPORT Rect { |
#elif defined(TOOLKIT_GTK) |
explicit Rect(const GdkRectangle& r); |
#endif |
-#if defined(USE_WAYLAND) |
- explicit Rect(const cairo_rectangle_int_t& r); |
-#endif |
explicit Rect(const gfx::Size& size); |
Rect(const gfx::Point& origin, const gfx::Size& size); |
@@ -59,9 +52,6 @@ class UI_EXPORT Rect { |
#elif defined(TOOLKIT_GTK) |
Rect& operator=(const GdkRectangle& r); |
#endif |
-#if defined(USE_WAYLAND) |
- Rect& operator=(const cairo_rectangle_int_t& r); |
-#endif |
int x() const { return origin_.x(); } |
void set_x(int x) { origin_.set_x(x); } |
@@ -129,9 +119,6 @@ class UI_EXPORT Rect { |
// Construct an equivalent CoreGraphics object. |
CGRect ToCGRect() const; |
#endif |
-#if defined(USE_WAYLAND) |
- cairo_rectangle_int_t ToCairoRectangle() const; |
-#endif |
// Returns true if the point identified by point_x and point_y falls inside |
// this rectangle. The point (x, y) is inside the rectangle, but the |