Change BufferManager::RequestBufferAccess signatures to avoid sprintfs.

gpu/command_buffer/service/buffer_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_BUFFER_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_BUFFER_MANAGER_H_
 
+#include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 293 matching lines @@
   // Same as above, but assume to access the entire buffer.
   Buffer* RequestBufferAccess(ContextState* context_state,
                               GLenum target,
                               const char* func_name);
   // Same as above, but it can be any buffer rather than the buffer bound to
   // |target|. Return true if access is granted; return false if a GL error is
   // generated.
   bool RequestBufferAccess(ErrorState* error_state,
                            Buffer* buffer,
                            const char* func_name,
-                           const char* message_tag);
+                           const char* error_message_format, ...);
   // Generates INVALID_OPERATION if offset + size is out of range.
   bool RequestBufferAccess(ErrorState* error_state,
                            Buffer* buffer,
                            GLintptr offset,
                            GLsizeiptr size,
                            const char* func_name,
-                           const char* message_tag);
+                           const char* error_message);
   // Returns false and generates INVALID_OPERATION if buffer at binding |ii|
   // doesn't exist, is mapped, or smaller than |variable_sizes[ii]| * |count|.
   // Return true otherwise.
   bool RequestBuffersAccess(
       ErrorState* error_state,
       const IndexedBufferBindingHost* bindings,
       const std::vector<GLsizeiptr>& variable_sizes,
       GLsizei count,
       const char* func_name,
       const char* message_tag);
@@ skipping 48 matching lines @@
   // If data is NULL buffer will be initialized to 0 if shadowed.
   void SetInfo(Buffer* buffer,
                GLenum target,
                GLsizeiptr size,
                GLenum usage,
                bool use_shadow);
 
   void IncreaseMappedBufferCount();
   void DecreaseMappedBufferCount();
 
+  // Same as public RequestBufferAccess taking similar arguments, but
+  // allows caller to assemble the va_list.
+  bool RequestBufferAccessV(ErrorState* error_state,
+                            Buffer* buffer,
+                            const char* func_name,
+                            const char* error_message_format,
+                            va_list varargs);
+
   std::unique_ptr<MemoryTypeTracker> memory_type_tracker_;
   MemoryTracker* memory_tracker_;
   scoped_refptr<FeatureInfo> feature_info_;
 
   // Info for each buffer in the system.
   typedef base::hash_map<GLuint, scoped_refptr<Buffer> > BufferMap;
   BufferMap buffers_;
 
   // The maximum size of buffers.
   GLsizeiptr max_buffer_size_;
@@ skipping 17 matching lines @@
   // so we could bypass checking each individual buffer as an optimization.
   uint32_t mapped_buffer_count_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_BUFFER_MANAGER_H_