Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1657)

Unified Diff: base/gfx/rect.h

Issue 7319: get webframe_impl.cc to compile on linux (Closed)
Patch Set: merge fixes from icefox Created 12 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/gfx/bitmap_platform_device_linux.cc ('k') | base/gfx/rect.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/gfx/rect.h
diff --git a/base/gfx/rect.h b/base/gfx/rect.h
index 963470a1e735c53aacdbb6a4d6467c87395e29e2..a7a3d9c721e18638e8fb9f4cd4f74384da16308a 100644
--- a/base/gfx/rect.h
+++ b/base/gfx/rect.h
@@ -17,6 +17,10 @@
#if defined(OS_WIN)
typedef struct tagRECT RECT;
+#elif defined(OS_LINUX)
+// It's wrong to hide GDK stuff behind OS_LINUX, but until we have a different
+// linux target, this is less complex.
+typedef struct _GdkRectangle GdkRectangle;
#endif
namespace gfx {
@@ -30,6 +34,8 @@ class Rect {
explicit Rect(const RECT& r);
#elif defined(OS_MACOSX)
explicit Rect(const CGRect& r);
+#elif defined(OS_LINUX)
+ explicit Rect(const GdkRectangle& r);
#endif
Rect(const gfx::Point& origin, const gfx::Size& size);
@@ -39,6 +45,8 @@ class Rect {
Rect& operator=(const RECT& r);
#elif defined(OS_MACOSX)
Rect& operator=(const CGRect& r);
+#elif defined(OS_LINUX)
+ Rect& operator=(const GdkRectangle& r);
#endif
int x() const { return origin_.x(); }
« no previous file with comments | « base/gfx/bitmap_platform_device_linux.cc ('k') | base/gfx/rect.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698