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

Side by Side Diff: ui/gfx/x/x11_types.h

Issue 1543183002: Switch to standard integer types in ui/gfx/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 unified diff | Download patch
« no previous file with comments | « ui/gfx/x/x11_switches.cc ('k') | ui/gfx/x/x11_types.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <stdint.h>
9
9 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
10 #include "ui/gfx/gfx_export.h" 11 #include "ui/gfx/gfx_export.h"
11 12
12 typedef unsigned long XAtom; 13 typedef unsigned long XAtom;
13 typedef unsigned long XID; 14 typedef unsigned long XID;
14 typedef struct _XImage XImage; 15 typedef struct _XImage XImage;
15 typedef struct _XGC *GC; 16 typedef struct _XGC *GC;
16 typedef struct _XDisplay XDisplay; 17 typedef struct _XDisplay XDisplay;
17 typedef struct __GLXFBConfigRec *GLXFBConfig; 18 typedef struct __GLXFBConfigRec *GLXFBConfig;
18 typedef XID GLXWindow; 19 typedef XID GLXWindow;
(...skipping 22 matching lines...) Expand all
41 GFX_EXPORT XDisplay* OpenNewXDisplay(); 42 GFX_EXPORT XDisplay* OpenNewXDisplay();
42 43
43 // Return the number of bits-per-pixel for a pixmap of the given depth 44 // Return the number of bits-per-pixel for a pixmap of the given depth
44 GFX_EXPORT int BitsPerPixelForPixmapDepth(XDisplay* display, int depth); 45 GFX_EXPORT int BitsPerPixelForPixmapDepth(XDisplay* display, int depth);
45 46
46 // Draws ARGB data on the given pixmap using the given GC, converting to the 47 // Draws ARGB data on the given pixmap using the given GC, converting to the
47 // server side visual depth as needed. Destination is assumed to be the same 48 // server side visual depth as needed. Destination is assumed to be the same
48 // dimensions as |data| or larger. |data| is also assumed to be in row order 49 // dimensions as |data| or larger. |data| is also assumed to be in row order
49 // with each line being exactly |width| * 4 bytes long. 50 // with each line being exactly |width| * 4 bytes long.
50 GFX_EXPORT void PutARGBImage(XDisplay* display, 51 GFX_EXPORT void PutARGBImage(XDisplay* display,
51 void* visual, int depth, 52 void* visual,
52 XID pixmap, void* pixmap_gc, 53 int depth,
53 const uint8* data, 54 XID pixmap,
54 int width, int height); 55 void* pixmap_gc,
56 const uint8_t* data,
57 int width,
58 int height);
55 59
56 // Same as above only more general: 60 // Same as above only more general:
57 // - |data_width| and |data_height| refer to the data image 61 // - |data_width| and |data_height| refer to the data image
58 // - |src_x|, |src_y|, |copy_width| and |copy_height| define source region 62 // - |src_x|, |src_y|, |copy_width| and |copy_height| define source region
59 // - |dst_x|, |dst_y|, |copy_width| and |copy_height| define destination region 63 // - |dst_x|, |dst_y|, |copy_width| and |copy_height| define destination region
60 GFX_EXPORT void PutARGBImage(XDisplay* display, 64 GFX_EXPORT void PutARGBImage(XDisplay* display,
61 void* visual, int depth, 65 void* visual,
62 XID pixmap, void* pixmap_gc, 66 int depth,
63 const uint8* data, 67 XID pixmap,
64 int data_width, int data_height, 68 void* pixmap_gc,
65 int src_x, int src_y, 69 const uint8_t* data,
66 int dst_x, int dst_y, 70 int data_width,
67 int copy_width, int copy_height); 71 int data_height,
72 int src_x,
73 int src_y,
74 int dst_x,
75 int dst_y,
76 int copy_width,
77 int copy_height);
68 78
69 } // namespace gfx 79 } // namespace gfx
70 80
71 #endif // UI_GFX_X_X11_UTIL_H_ 81 #endif // UI_GFX_X_X11_UTIL_H_
72 82
OLDNEW
« no previous file with comments | « ui/gfx/x/x11_switches.cc ('k') | ui/gfx/x/x11_types.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698