| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_GFX_X_X11_UTIL_H_ | 5 #ifndef UI_GFX_X_X11_UTIL_H_ |
| 6 #define UI_GFX_X_X11_UTIL_H_ | 6 #define UI_GFX_X_X11_UTIL_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "ui/gfx/gfx_export.h" | 9 #include "ui/gfx/gfx_export.h" |
| 10 | 10 |
| 11 typedef unsigned long Atom; |
| 11 typedef unsigned long XID; | 12 typedef unsigned long XID; |
| 12 typedef struct _XImage XImage; | 13 typedef struct _XImage XImage; |
| 13 typedef struct _XGC *GC; | 14 typedef struct _XGC *GC; |
| 14 typedef struct _XDisplay XDisplay; | 15 typedef struct _XDisplay XDisplay; |
| 15 | 16 |
| 16 namespace gfx { | 17 namespace gfx { |
| 17 | 18 |
| 18 // TODO(oshima|evan): This assume there is one display and doesn't work | 19 // TODO(oshima|evan): This assume there is one display and doesn't work |
| 19 // undef multiple displays/monitor environment. Remove this and change the | 20 // undef multiple displays/monitor environment. Remove this and change the |
| 20 // chrome codebase to get the display from window. | 21 // chrome codebase to get the display from window. |
| (...skipping 22 matching lines...) Expand all Loading... |
| 43 const uint8* data, | 44 const uint8* data, |
| 44 int data_width, int data_height, | 45 int data_width, int data_height, |
| 45 int src_x, int src_y, | 46 int src_x, int src_y, |
| 46 int dst_x, int dst_y, | 47 int dst_x, int dst_y, |
| 47 int copy_width, int copy_height); | 48 int copy_width, int copy_height); |
| 48 | 49 |
| 49 } // namespace gfx | 50 } // namespace gfx |
| 50 | 51 |
| 51 #endif // UI_GFX_X_X11_UTIL_H_ | 52 #endif // UI_GFX_X_X11_UTIL_H_ |
| 52 | 53 |
| OLD | NEW |