| Index: ui/surface/transport_dib.h
|
| diff --git a/ui/surface/transport_dib.h b/ui/surface/transport_dib.h
|
| index 301654867775b2992629d9d6b66dda45f5ae269d..a14be68fcbb55cd06dbd0e4733515ef8fbc8734a 100644
|
| --- a/ui/surface/transport_dib.h
|
| +++ b/ui/surface/transport_dib.h
|
| @@ -5,8 +5,12 @@
|
| #ifndef UI_SURFACE_TRANSPORT_DIB_H_
|
| #define UI_SURFACE_TRANSPORT_DIB_H_
|
|
|
| -#include "base/basictypes.h"
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| +#include "base/macros.h"
|
| #include "base/memory/shared_memory.h"
|
| +#include "build/build_config.h"
|
| #include "ui/surface/surface_export.h"
|
|
|
| #if defined(OS_WIN)
|
| @@ -43,7 +47,7 @@ class SURFACE_EXPORT TransportDIB {
|
| // The sequence number is used to uniquely identify the transport DIB. It
|
| // should be unique for all transport DIBs ever created in the same
|
| // renderer.
|
| - static TransportDIB* Create(size_t size, uint32 sequence_num);
|
| + static TransportDIB* Create(size_t size, uint32_t sequence_num);
|
|
|
| // Map the referenced transport DIB. The caller owns the returned object.
|
| // Returns NULL on failure.
|
| @@ -92,7 +96,7 @@ class SURFACE_EXPORT TransportDIB {
|
|
|
| explicit TransportDIB(base::SharedMemoryHandle dib);
|
| base::SharedMemory shared_memory_;
|
| - uint32 sequence_num_;
|
| + uint32_t sequence_num_;
|
| size_t size_; // length, in bytes
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TransportDIB);
|
|
|