| Index: gpu/command_buffer/client/fenced_allocator.h
|
| diff --git a/gpu/command_buffer/client/fenced_allocator.h b/gpu/command_buffer/client/fenced_allocator.h
|
| index 77fadc3dd8fc9e517a28a4742d82a8f708b69e56..8e222e135bf6a329988141138a657e87f8be6c79 100644
|
| --- a/gpu/command_buffer/client/fenced_allocator.h
|
| +++ b/gpu/command_buffer/client/fenced_allocator.h
|
| @@ -7,11 +7,13 @@
|
| #ifndef GPU_COMMAND_BUFFER_CLIENT_FENCED_ALLOCATOR_H_
|
| #define GPU_COMMAND_BUFFER_CLIENT_FENCED_ALLOCATOR_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
| -#include "gpu/command_buffer/common/types.h"
|
| +#include "base/macros.h"
|
| #include "gpu/gpu_export.h"
|
|
|
| namespace gpu {
|
| @@ -101,7 +103,7 @@ class GPU_EXPORT FencedAllocator {
|
| State state;
|
| Offset offset;
|
| unsigned int size;
|
| - int32 token; // token to wait for in the FREE_PENDING_TOKEN case.
|
| + int32_t token; // token to wait for in the FREE_PENDING_TOKEN case.
|
| };
|
|
|
| // Comparison functor for memory block sorting.
|
| @@ -115,7 +117,7 @@ class GPU_EXPORT FencedAllocator {
|
| typedef std::vector<Block> Container;
|
| typedef unsigned int BlockIndex;
|
|
|
| - static const int32 kUnusedToken = 0;
|
| + static const int32_t kUnusedToken = 0;
|
|
|
| // Gets the index of a memory block, given its offset.
|
| BlockIndex GetBlockByOffset(Offset offset);
|
|
|