| Index: cc/resources/shared_bitmap.h
|
| diff --git a/cc/resources/shared_bitmap.h b/cc/resources/shared_bitmap.h
|
| index 04dab7456fa92910dcbfa359ada39459b715ae18..c711a8b5ea47d470abc5f42eabe4d119b64ecae8 100644
|
| --- a/cc/resources/shared_bitmap.h
|
| +++ b/cc/resources/shared_bitmap.h
|
| @@ -5,7 +5,10 @@
|
| #ifndef CC_RESOURCES_SHARED_BITMAP_H_
|
| #define CC_RESOURCES_SHARED_BITMAP_H_
|
|
|
| -#include "base/basictypes.h"
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| +#include "base/macros.h"
|
| #include "base/trace_event/memory_allocator_dump.h"
|
| #include "cc/base/cc_export.h"
|
| #include "gpu/command_buffer/common/mailbox.h"
|
| @@ -19,11 +22,11 @@ GetSharedBitmapGUIDForTracing(const SharedBitmapId& bitmap_id);
|
|
|
| class CC_EXPORT SharedBitmap {
|
| public:
|
| - SharedBitmap(uint8* pixels, const SharedBitmapId& id);
|
| + SharedBitmap(uint8_t* pixels, const SharedBitmapId& id);
|
|
|
| virtual ~SharedBitmap();
|
|
|
| - uint8* pixels() { return pixels_; }
|
| + uint8_t* pixels() { return pixels_; }
|
|
|
| const SharedBitmapId& id() { return id_; }
|
|
|
| @@ -41,7 +44,7 @@ class CC_EXPORT SharedBitmap {
|
| static SharedBitmapId GenerateId();
|
|
|
| private:
|
| - uint8* pixels_;
|
| + uint8_t* pixels_;
|
| SharedBitmapId id_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SharedBitmap);
|
|
|