| Index: cc/resources/texture_mailbox.h
|
| diff --git a/cc/resources/texture_mailbox.h b/cc/resources/texture_mailbox.h
|
| index 01cc660c0b96e031ef83d2ea29da2b89f9ef1d4c..42109c686de4b816d9cf42f3efb3513e03d018e7 100644
|
| --- a/cc/resources/texture_mailbox.h
|
| +++ b/cc/resources/texture_mailbox.h
|
| @@ -5,6 +5,9 @@
|
| #ifndef CC_RESOURCES_TEXTURE_MAILBOX_H_
|
| #define CC_RESOURCES_TEXTURE_MAILBOX_H_
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include <string>
|
|
|
| #include "base/memory/shared_memory.h"
|
| @@ -23,10 +26,10 @@ class CC_EXPORT TextureMailbox {
|
| explicit TextureMailbox(const gpu::MailboxHolder& mailbox_holder);
|
| TextureMailbox(const gpu::Mailbox& mailbox,
|
| const gpu::SyncToken& sync_token,
|
| - uint32 target);
|
| + uint32_t target);
|
| TextureMailbox(const gpu::Mailbox& mailbox,
|
| const gpu::SyncToken& sync_token,
|
| - uint32 target,
|
| + uint32_t target,
|
| const gfx::Size& size_in_pixels,
|
| bool is_overlay_candidate);
|
| TextureMailbox(SharedBitmap* shared_bitmap, const gfx::Size& size_in_pixels);
|
| @@ -40,8 +43,8 @@ class CC_EXPORT TextureMailbox {
|
| bool Equals(const TextureMailbox&) const;
|
|
|
| const gpu::Mailbox& mailbox() const { return mailbox_holder_.mailbox; }
|
| - const int8* name() const { return mailbox().name; }
|
| - uint32 target() const { return mailbox_holder_.texture_target; }
|
| + const int8_t* name() const { return mailbox().name; }
|
| + uint32_t target() const { return mailbox_holder_.texture_target; }
|
| const gpu::SyncToken& sync_token() const {
|
| return mailbox_holder_.sync_token;
|
| }
|
|
|