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

Unified 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 5 years 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 | « ui/gfx/x/x11_switches.cc ('k') | ui/gfx/x/x11_types.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/x/x11_types.h
diff --git a/ui/gfx/x/x11_types.h b/ui/gfx/x/x11_types.h
index 980ec06ea5d05d5e19a6962ab0bf381c7a4eef66..2b00a2150d8048577475e275da7dff78a4237ab6 100644
--- a/ui/gfx/x/x11_types.h
+++ b/ui/gfx/x/x11_types.h
@@ -5,7 +5,8 @@
#ifndef UI_GFX_X_X11_UTIL_H_
#define UI_GFX_X_X11_UTIL_H_
-#include "base/basictypes.h"
+#include <stdint.h>
+
#include "base/memory/scoped_ptr.h"
#include "ui/gfx/gfx_export.h"
@@ -48,23 +49,32 @@ GFX_EXPORT int BitsPerPixelForPixmapDepth(XDisplay* display, int depth);
// dimensions as |data| or larger. |data| is also assumed to be in row order
// with each line being exactly |width| * 4 bytes long.
GFX_EXPORT void PutARGBImage(XDisplay* display,
- void* visual, int depth,
- XID pixmap, void* pixmap_gc,
- const uint8* data,
- int width, int height);
+ void* visual,
+ int depth,
+ XID pixmap,
+ void* pixmap_gc,
+ const uint8_t* data,
+ int width,
+ int height);
// Same as above only more general:
// - |data_width| and |data_height| refer to the data image
// - |src_x|, |src_y|, |copy_width| and |copy_height| define source region
// - |dst_x|, |dst_y|, |copy_width| and |copy_height| define destination region
GFX_EXPORT void PutARGBImage(XDisplay* display,
- void* visual, int depth,
- XID pixmap, void* pixmap_gc,
- const uint8* data,
- int data_width, int data_height,
- int src_x, int src_y,
- int dst_x, int dst_y,
- int copy_width, int copy_height);
+ void* visual,
+ int depth,
+ XID pixmap,
+ void* pixmap_gc,
+ const uint8_t* data,
+ int data_width,
+ int data_height,
+ int src_x,
+ int src_y,
+ int dst_x,
+ int dst_y,
+ int copy_width,
+ int copy_height);
} // namespace gfx
« 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