Remove command_buffer/common/types.h.

gpu/command_buffer/client/mapped_memory.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_MAPPED_MEMORY_H_
 #define GPU_COMMAND_BUFFER_CLIENT_MAPPED_MEMORY_H_
 
+#include <stdint.h>
+
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "gpu/command_buffer/client/fenced_allocator.h"
 #include "gpu/command_buffer/common/buffer.h"
-#include "gpu/command_buffer/common/types.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 
 class CommandBufferHelper;
 
 // Manages a shared memory segment.
 class GPU_EXPORT MemoryChunk {
  public:
-  MemoryChunk(int32 shm_id,
+  MemoryChunk(int32_t shm_id,
               scoped_refptr<gpu::Buffer> shm,
               CommandBufferHelper* helper,
               const base::Closure& poll_callback);
   ~MemoryChunk();
 
   // Gets the size of the largest free block that is available without waiting.
   unsigned int GetLargestFreeSizeWithoutWaiting() {
     return allocator_.GetLargestFreeSize();
   }
 
   // Gets the size of the largest free block that can be allocated if the
   // caller can wait.
   unsigned int GetLargestFreeSizeWithWaiting() {
     return allocator_.GetLargestFreeOrPendingSize();
   }
 
   // Gets the size of the chunk.
   unsigned int GetSize() const {
     return static_cast<unsigned int>(shm_->size());
   }
 
   // The shared memory id for this chunk.
-  int32 shm_id() const {
+  int32_t shm_id() const {
     return shm_id_;
   }
 
   // Allocates a block of memory. If the buffer is out of directly available
   // memory, this function may wait until memory that was freed "pending a
   // token" can be re-used.
   //
   // Parameters:
   //   size: the size of the memory block to allocate.
   //
@@ skipping 30 matching lines @@
 
   // Frees any blocks whose tokens have passed.
   void FreeUnused() {
     allocator_.FreeUnused();
   }
 
   // Returns true if pointer is in the range of this block.
   bool IsInChunk(void* pointer) const {
     return pointer >= shm_->memory() &&
            pointer <
-               reinterpret_cast<const int8*>(shm_->memory()) + shm_->size();
+               reinterpret_cast<const int8_t*>(shm_->memory()) + shm_->size();
   }
 
   // Returns true of any memory in this chunk is in use.
   bool InUse() {
     return allocator_.InUse();
   }
 
   size_t bytes_in_use() const {
     return allocator_.bytes_in_use();
   }
 
  private:
-  int32 shm_id_;
+  int32_t shm_id_;
   scoped_refptr<gpu::Buffer> shm_;
   FencedAllocatorWrapper allocator_;
 
   DISALLOW_COPY_AND_ASSIGN(MemoryChunk);
 };
 
 // Manages MemoryChunks.
 class GPU_EXPORT MappedMemoryManager {
  public:
   enum MemoryLimit {
@@ skipping 17 matching lines @@
   }
 
   // Allocates a block of memory
   // Parameters:
   //   size: size of memory to allocate.
   //   shm_id: pointer to variable to receive the shared memory id.
   //   shm_offset: pointer to variable to receive the shared memory offset.
   // Returns:
   //   pointer to allocated block of memory. NULL if failure.
   void* Alloc(
-      unsigned int size, int32* shm_id, unsigned int* shm_offset);
+      unsigned int size, int32_t* shm_id, unsigned int* shm_offset);
 
   // Frees a block of memory.
   //
   // Parameters:
   //   pointer: the pointer to the memory block to free.
   void Free(void* pointer);
 
   // Frees a block of memory, pending the passage of a token. That memory won't
   // be re-allocated until the token has passed through the command stream.
   //
   // Parameters:
   //   pointer: the pointer to the memory block to free.
   //   token: the token value to wait for before re-using the memory.
-  void FreePendingToken(void* pointer, int32 token);
+  void FreePendingToken(void* pointer, int32_t token);
 
   // Free Any Shared memory that is not in use.
   void FreeUnused();
 
   // Used for testing
   size_t num_chunks() const {
     return chunks_.size();
   }
 
   size_t bytes_in_use() const {
@@ skipping 21 matching lines @@
   size_t allocated_memory_;
   size_t max_free_bytes_;
 
   DISALLOW_COPY_AND_ASSIGN(MappedMemoryManager);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_MAPPED_MEMORY_H_