Switch to standard integer types in gpu/.

gpu/command_buffer/service/framebuffer_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_FRAMEBUFFER_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
 
 class FramebufferCompletenessCache;
@@ skipping 18 matching lines @@
     virtual bool cleared() const = 0;
     virtual void SetCleared(
         RenderbufferManager* renderbuffer_manager,
         TextureManager* texture_manager,
         bool cleared) = 0;
     virtual bool IsTexture(TextureRef* texture) const = 0;
     virtual bool IsRenderbuffer(
         Renderbuffer* renderbuffer) const = 0;
     virtual bool CanRenderTo() const = 0;
     virtual void DetachFromFramebuffer(Framebuffer* framebuffer) const = 0;
-    virtual bool ValidForAttachmentType(
-        GLenum attachment_type, uint32 max_color_attachments) = 0;
+    virtual bool ValidForAttachmentType(GLenum attachment_type,
+                                        uint32_t max_color_attachments) = 0;
     virtual size_t GetSignatureSize(TextureManager* texture_manager) const = 0;
     virtual void AddToSignature(
         TextureManager* texture_manager, std::string* signature) const = 0;
     virtual bool FormsFeedbackLoop(TextureRef* texture, GLint level) const = 0;
 
    protected:
     friend class base::RefCounted<Attachment>;
     virtual ~Attachment() {}
   };
 
@@ skipping 167 matching lines @@
 
   // The currently bound framebuffers
   scoped_refptr<Framebuffer> bound_read_framebuffer;
   scoped_refptr<Framebuffer> bound_draw_framebuffer;
 };
 
 // This class keeps track of the frambebuffers and their attached renderbuffers
 // so we can correctly clear them.
 class GPU_EXPORT FramebufferManager {
  public:
-  FramebufferManager(uint32 max_draw_buffers,
-                     uint32 max_color_attachments,
+  FramebufferManager(uint32_t max_draw_buffers,
+                     uint32_t max_color_attachments,
                      ContextType context_type,
                      const scoped_refptr<FramebufferCompletenessCache>&
                          framebuffer_combo_complete_cache);
   ~FramebufferManager();
 
   // Must call before destruction.
   void Destroy(bool have_context);
 
   // Creates a Framebuffer for the given framebuffer.
   void CreateFramebuffer(GLuint client_id, GLuint service_id);
@@ skipping 42 matching lines @@
   // Incremented anytime anything changes that might effect framebuffer
   // state.
   unsigned framebuffer_state_change_count_;
 
   // Counts the number of Framebuffer allocated with 'this' as its manager.
   // Allows to check no Framebuffer will outlive this.
   unsigned int framebuffer_count_;
 
   bool have_context_;
 
-  uint32 max_draw_buffers_;
-  uint32 max_color_attachments_;
+  uint32_t max_draw_buffers_;
+  uint32_t max_color_attachments_;
 
   ContextType context_type_;
 
   scoped_refptr<FramebufferCompletenessCache> framebuffer_combo_complete_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(FramebufferManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_FRAMEBUFFER_MANAGER_H_