Remove command_buffer/common/types.h.

gpu/command_buffer/client/fenced_allocator.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.
 
 // This file contains the definition of the FencedAllocator class.
 
 #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 {
 class CommandBufferHelper;
 
 // FencedAllocator provides a mechanism to manage allocations within a fixed
 // block of memory (storing the book-keeping externally). Furthermore this
 // class allows to free data "pending" the passage of a command buffer token,
 // that is, the memory won't be reused until the command buffer has processed
 // that token.
@@ skipping 69 matching lines @@
     IN_USE,
     FREE,
     FREE_PENDING_TOKEN
   };
 
   // Book-keeping sturcture that describes a block of memory.
   struct Block {
     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.
   class OffsetCmp {
    public:
     bool operator() (const Block &left, const Block &right) {
       return left.offset < right.offset;
     }
   };
 
   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);
 
   // Collapse a free block with its neighbours if they are free. Returns the
   // index of the collapsed block.
   // NOTE: this will invalidate block indices.
   BlockIndex CollapseFreeBlock(BlockIndex index);
 
   // Waits for a FREE_PENDING_TOKEN block to be usable, and free it. Returns
@@ skipping 126 matching lines @@
 
  private:
   FencedAllocator allocator_;
   void* base_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(FencedAllocatorWrapper);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_FENCED_ALLOCATOR_H_