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

Unified Diff: ui/gfx/x/x11_types.cc

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_types.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/x/x11_types.cc
diff --git a/ui/gfx/x/x11_types.cc b/ui/gfx/x/x11_types.cc
index e74129e216a77cc8d2bd80c45c5f45a39fcc3672..7540f8ae2887cbcdcebf09982790a8a8ba797314 100644
--- a/ui/gfx/x/x11_types.cc
+++ b/ui/gfx/x/x11_types.cc
@@ -8,6 +8,7 @@
#include "base/command_line.h"
#include "base/message_loop/message_loop.h"
+#include "build/build_config.h"
#include "ui/gfx/x/x11_switches.h"
namespace gfx {
@@ -30,10 +31,13 @@ XDisplay* OpenNewXDisplay() {
}
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) {
PutARGBImage(display,
visual, depth,
pixmap, pixmap_gc,
@@ -58,13 +62,19 @@ int BitsPerPixelForPixmapDepth(XDisplay* dpy, int depth) {
}
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) {
// TODO(scherkus): potential performance impact... consider passing in as a
// parameter.
int pixmap_bpp = BitsPerPixelForPixmapDepth(display, depth);
« no previous file with comments | « ui/gfx/x/x11_types.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698