Switch to standard integer types in gpu/.

gpu/command_buffer/service/gles2_cmd_decoder.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 GLES2Decoder class.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "gpu/command_buffer/common/capabilities.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/service/common_decoder.h"
 #include "gpu/gpu_export.h"
@@ skipping 33 matching lines @@
 
 typedef base::Callback<void(const std::string& key,
                             const std::string& shader)> ShaderCacheCallback;
 
 // This class implements the AsyncAPIInterface interface, decoding GLES2
 // commands and calling GL.
 class GPU_EXPORT GLES2Decoder : public base::SupportsWeakPtr<GLES2Decoder>,
                                 public CommonDecoder {
  public:
   typedef error::Error Error;
-  typedef base::Callback<bool(uint32 id)> WaitSyncPointCallback;
+  typedef base::Callback<bool(uint32_t id)> WaitSyncPointCallback;
   typedef base::Callback<void(uint64_t release)> FenceSyncReleaseCallback;
   typedef base::Callback<bool(gpu::CommandBufferNamespace namespace_id,
                               uint64_t command_buffer_id,
                               uint64_t release)> WaitFenceSyncCallback;
 
   // The default stencil mask, which has all bits set.  This really should be a
   // GLuint, but we can't #include gl_bindings.h in this file without causing
   // macro redefinitions.
   static const unsigned int kDefaultStencilMask;
 
@@ skipping 46 matching lines @@
   //      bound, offscreen contexts render to an internal buffer, onscreen ones
   //      to the surface.
   //  offscreen_size: the size if the GL context is offscreen.
   // Returns:
   //   true if successful.
   virtual bool Initialize(const scoped_refptr<gfx::GLSurface>& surface,
                           const scoped_refptr<gfx::GLContext>& context,
                           bool offscreen,
                           const gfx::Size& offscreen_size,
                           const DisallowedFeatures& disallowed_features,
-                          const std::vector<int32>& attribs) = 0;
+                          const std::vector<int32_t>& attribs) = 0;
 
   // Destroys the graphics context.
   virtual void Destroy(bool have_context) = 0;
 
   // Set the surface associated with the default FBO.
   virtual void SetSurface(const scoped_refptr<gfx::GLSurface>& surface) = 0;
 
   virtual void ProduceFrontBuffer(const Mailbox& mailbox) = 0;
 
   // Resize an offscreen frame buffer.
@@ skipping 27 matching lines @@
   virtual void RestoreGlobalState() const = 0;
   virtual void RestoreProgramBindings() const = 0;
   virtual void RestoreTextureState(unsigned service_id) const = 0;
   virtual void RestoreTextureUnitBindings(unsigned unit) const = 0;
 
   virtual void ClearAllAttributes() const = 0;
   virtual void RestoreAllAttributes() const = 0;
 
   virtual void SetIgnoreCachedStateForTest(bool ignore) = 0;
   virtual void SetForceShaderNameHashingForTest(bool force) = 0;
-  virtual uint32 GetAndClearBackbufferClearBitsForTest();
+  virtual uint32_t GetAndClearBackbufferClearBitsForTest();
 
   // Gets the QueryManager for this context.
   virtual QueryManager* GetQueryManager() = 0;
 
   // Gets the VertexArrayManager for this context.
   virtual VertexArrayManager* GetVertexArrayManager() = 0;
 
   // Gets the ImageManager for this context.
   virtual ImageManager* GetImageManager() = 0;
 
   // Gets the ValuebufferManager for this context.
   virtual ValuebufferManager* GetValuebufferManager() = 0;
 
   // Returns false if there are no pending queries.
   virtual bool HasPendingQueries() const = 0;
 
   // Process any pending queries.
   virtual void ProcessPendingQueries(bool did_finish) = 0;
 
   // Returns false if there is no idle work to be made.
   virtual bool HasMoreIdleWork() const = 0;
 
   // Perform any idle work that needs to be made.
   virtual void PerformIdleWork() = 0;
 
   // Get the service texture ID corresponding to a client texture ID.
   // If no such record is found then return false.
-  virtual bool GetServiceTextureId(uint32 client_texture_id,
-                                   uint32* service_texture_id);
+  virtual bool GetServiceTextureId(uint32_t client_texture_id,
+                                   uint32_t* service_texture_id);
 
   // Provides detail about a lost context if one occurred.
   virtual error::ContextLostReason GetContextLostReason() = 0;
 
   // Clears a level sub area of a texture
   // Returns false if a GL error should be generated.
   virtual bool ClearLevel(Texture* texture,
                           unsigned target,
                           int level,
                           unsigned format,
@@ skipping 14 matching lines @@
       const WaitSyncPointCallback& callback) = 0;
 
   // Sets the callback for fence sync release and wait calls. The wait call
   // returns true if the channel is still scheduled.
   virtual void SetFenceSyncReleaseCallback(
       const FenceSyncReleaseCallback& callback) = 0;
   virtual void SetWaitFenceSyncCallback(
       const WaitFenceSyncCallback& callback) = 0;
 
   virtual void WaitForReadPixels(base::Closure callback) = 0;
-  virtual uint32 GetTextureUploadCount() = 0;
+  virtual uint32_t GetTextureUploadCount() = 0;
   virtual base::TimeDelta GetTotalTextureUploadTime() = 0;
   virtual base::TimeDelta GetTotalProcessingCommandsTime() = 0;
   virtual void AddProcessingCommandsTime(base::TimeDelta) = 0;
 
   // Returns true if the context was lost either by GL_ARB_robustness, forced
   // context loss or command buffer parse error.
   virtual bool WasContextLost() const = 0;
 
   // Returns true if the context was lost specifically by GL_ARB_robustness.
   virtual bool WasContextLostByRobustnessExtension() const = 0;
@@ skipping 17 matching lines @@
   bool log_commands_;
   bool unsafe_es3_apis_enabled_;
   bool force_shader_name_hashing_for_test_;
   DISALLOW_COPY_AND_ASSIGN(GLES2Decoder);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_H_