Switch to standard integer types in gpu/.

gpu/command_buffer/service/query_manager.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_SERVICE_QUERY_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_
 
+#include <stdint.h>
+
 #include <deque>
 #include <vector>
 #include "base/atomicops.h"
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/gpu_export.h"
 
 namespace gfx {
   class GPUTimer;
   class GPUTimingClient;
 }
 
 namespace gpu {
 
 class GLES2Decoder;
 
 namespace gles2 {
 
 class FeatureInfo;
 
 // This class keeps track of the queries and their state
 // As Queries are not shared there is one QueryManager per context.
 class GPU_EXPORT QueryManager {
  public:
   class GPU_EXPORT Query : public base::RefCounted<Query> {
    public:
-    Query(
-        QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset);
+    Query(QueryManager* manager,
+          GLenum target,
+          int32_t shm_id,
+          uint32_t shm_offset);
 
     GLenum target() const {
       return target_;
     }
 
     bool IsDeleted() const {
       return deleted_;
     }
 
     bool IsValid() const {
       return target() && !IsDeleted();
     }
 
     bool IsActive() const {
       return query_state_ == kQueryState_Active;
     }
 
     bool IsPaused() const {
       return query_state_ == kQueryState_Paused;
     }
 
     bool IsPending() const {
       return query_state_ == kQueryState_Pending;
     }
 
     bool IsFinished() const {
       return query_state_ == kQueryState_Finished;
     }
 
-    int32 shm_id() const {
-      return shm_id_;
-    }
+    int32_t shm_id() const { return shm_id_; }
 
-    uint32 shm_offset() const {
-      return shm_offset_;
-    }
+    uint32_t shm_offset() const { return shm_offset_; }
 
     // Returns false if shared memory for sync is invalid.
     virtual bool Begin() = 0;
 
     // Returns false if shared memory for sync is invalid.
     virtual bool End(base::subtle::Atomic32 submit_count) = 0;
 
     // Returns false if shared memory for sync is invalid.
     virtual bool QueryCounter(base::subtle::Atomic32 submit_count) = 0;
 
@@ skipping 33 matching lines @@
       query_state_ = kQueryState_Paused;
     }
 
     void MarkAsPending(base::subtle::Atomic32 submit_count) {
       DCHECK(query_state_ == kQueryState_Active);
       query_state_ = kQueryState_Pending;
       submit_count_ = submit_count;
     }
 
     // Returns false if shared memory for sync is invalid.
-    bool MarkAsCompleted(uint64 result);
+    bool MarkAsCompleted(uint64_t result);
 
     void UnmarkAsPending() {
       DCHECK(query_state_ == kQueryState_Pending);
       query_state_ = kQueryState_Finished;
     }
 
     // Returns false if shared memory for sync is invalid.
     bool AddToPendingQueue(base::subtle::Atomic32 submit_count) {
       return manager_->AddPendingQuery(this, submit_count);
     }
@@ skipping 32 matching lines @@
 
     void RunCallbacks();
 
     // The manager that owns this Query.
     QueryManager* manager_;
 
     // The type of query.
     GLenum target_;
 
     // The shared memory used with this Query.
-    int32 shm_id_;
-    uint32 shm_offset_;
+    int32_t shm_id_;
+    uint32_t shm_offset_;
 
     // Count to set process count do when completed.
     base::subtle::Atomic32 submit_count_;
 
     // Current state of the query.
     enum QueryState {
       kQueryState_Initialize, // Has not been queried yet.
       kQueryState_Active, // Query began but has not ended.
       kQueryState_Paused, // Query was active but is now paused.
       kQueryState_Pending, // Query ended, waiting for result.
       kQueryState_Finished, // Query received result.
     } query_state_;
 
     // True if deleted.
     bool deleted_;
 
     // List of callbacks to run when result is available.
     std::vector<base::Closure> callbacks_;
   };
 
   QueryManager(
       GLES2Decoder* decoder,
       FeatureInfo* feature_info);
   ~QueryManager();
 
   // Must call before destruction.
   void Destroy(bool have_context);
 
   // Sets up a location to be incremented whenever a disjoint is detected.
-  void SetDisjointSync(int32 shm_id, uint32 shm_offset);
+  void SetDisjointSync(int32_t shm_id, uint32_t shm_offset);
 
   // Creates a Query for the given query.
-  Query* CreateQuery(
-      GLenum target, GLuint client_id, int32 shm_id, uint32 shm_offset);
+  Query* CreateQuery(GLenum target,
+                     GLuint client_id,
+                     int32_t shm_id,
+                     uint32_t shm_offset);
 
   // Gets the query info for the given query.
   Query* GetQuery(GLuint client_id);
 
   // Gets the currently active query for a target.
   Query* GetActiveQuery(GLenum target);
 
   // Removes a query info for the given query.
   void RemoveQuery(GLuint client_id);
 
@@ skipping 109 matching lines @@
 
   scoped_refptr<gfx::GPUTimingClient> gpu_timing_client_;
 
   DISALLOW_COPY_AND_ASSIGN(QueryManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_