Switch to standard integer types in gpu/.

gpu/command_buffer/client/share_group.cc

 // 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.
 
 #include "gpu/command_buffer/client/share_group.h"
 
+#include <stdint.h>
+
 #include <stack>
 #include <vector>
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/synchronization/lock.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/program_info_manager.h"
 #include "gpu/command_buffer/common/id_allocator.h"
 
 namespace gpu {
 namespace gles2 {
 
@@ skipping 207 matching lines @@
   // Overridden from IdHandlerInterface.
   void FreeContext(GLES2Implementation* gl_impl) override {
     base::AutoLock auto_lock(lock_);
     CollectPendingFreeIds(gl_impl);
   }
 
  private:
   enum IdState { kIdFree, kIdPendingFree, kIdInUse };
 
   void CollectPendingFreeIds(GLES2Implementation* gl_impl) {
-    uint32 flush_generation = gl_impl->helper()->flush_generation();
+    uint32_t flush_generation = gl_impl->helper()->flush_generation();
     ShareGroupContextData::IdHandlerData* ctxt_data =
         gl_impl->share_group_context_data()->id_handler_data(id_namespace_);
 
     if (ctxt_data->flush_generation_ != flush_generation) {
       ctxt_data->flush_generation_ = flush_generation;
-      for (uint32 ii = 0; ii < ctxt_data->freed_ids_.size(); ++ii) {
+      for (uint32_t ii = 0; ii < ctxt_data->freed_ids_.size(); ++ii) {
         const GLuint id = ctxt_data->freed_ids_[ii];
         DCHECK(id_states_[id - 1] == kIdPendingFree);
         id_states_[id - 1] = kIdFree;
         free_ids_.push(id);
       }
       ctxt_data->freed_ids_.clear();
     }
   }
 
   int id_namespace_;
 
   base::Lock lock_;
-  std::vector<uint8> id_states_;
-  std::stack<uint32> free_ids_;
+  std::vector<uint8_t> id_states_;
+  std::stack<uint32_t> free_ids_;
 };
 
 // An id handler for ids that are never reused.
 class NonReusedIdHandler : public IdHandlerInterface {
  public:
   NonReusedIdHandler() : last_id_(0) {}
   ~NonReusedIdHandler() override {}
 
   // Overridden from IdHandlerInterface.
   void MakeIds(GLES2Implementation* /* gl_impl */,
@@ skipping 106 matching lines @@
 }
 
 void ShareGroup::set_program_info_manager(ProgramInfoManager* manager) {
   program_info_manager_.reset(manager);
 }
 
 ShareGroup::~ShareGroup() {}
 
 }  // namespace gles2
 }  // namespace gpu