Index: ui/gfx/rect.cc |
diff --git a/ui/gfx/rect.cc b/ui/gfx/rect.cc |
index f05dc09d66cac3342b9d3ba4de5d22a98994bef5..7a3f347688734fbd1ce3b6913f6bdfe699c84330 100644 |
--- a/ui/gfx/rect.cc |
+++ b/ui/gfx/rect.cc |
@@ -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. |
@@ -11,9 +11,6 @@ |
#elif defined(TOOLKIT_GTK) |
#include <gdk/gdk.h> |
#endif |
-#if defined(USE_WAYLAND) |
-#include <cairo.h> |
-#endif |
#include "base/logging.h" |
#include "base/stringprintf.h" |
@@ -94,20 +91,6 @@ Rect& Rect::operator=(const GdkRectangle& r) { |
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); |
@@ -164,12 +147,6 @@ GdkRectangle Rect::ToGdkRectangle() const { |
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()) && |