Refactor/Rename a bunch of GPU stuff

gpu/command_buffer/service/context_state.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/service/context_state.h"
 
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 
@@ skipping 52 matching lines @@
 
   if (feature_info_->feature_flags().arb_texture_rectangle) {
     service_id = texture_unit.bound_texture_rectangle_arb ?
         texture_unit.bound_texture_rectangle_arb->service_id() : 0;
     glBindTexture(GL_TEXTURE_RECTANGLE_ARB, service_id);
   }
 }
 
 void ContextState::RestoreBufferBindings() const {
   if (vertex_attrib_manager) {
-    BufferManager::BufferInfo* element_array_buffer =
+    BufferManager::Buffer* element_array_buffer =
         vertex_attrib_manager->element_array_buffer();
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,
         element_array_buffer ? element_array_buffer->service_id() : 0);
   }
   glBindBuffer(
       GL_ARRAY_BUFFER,
       bound_array_buffer ? bound_array_buffer->service_id() : 0);
 }
 
 void ContextState::RestoreRenderbufferBindings() const {
   // Restore Bindings
   glBindRenderbufferEXT(
       GL_RENDERBUFFER,
       bound_renderbuffer ? bound_renderbuffer->service_id() : 0);
 }
 
 void ContextState::RestoreProgramBindings() const {
   glUseProgram(current_program ? current_program->service_id() : 0);
 }
 
 void ContextState::RestoreActiveTexture() const {
   glActiveTexture(GL_TEXTURE0 + active_texture_unit);
 }
 
 void ContextState::RestoreAttribute(GLuint attrib) const {
-  const VertexAttribManager::VertexAttribInfo* info =
-      vertex_attrib_manager->GetVertexAttribInfo(attrib);
+  const VertexAttrib* info =
+      vertex_attrib_manager->GetVertexAttrib(attrib);
   const void* ptr = reinterpret_cast<const void*>(info->offset());
-  BufferManager::BufferInfo* buffer_info = info->buffer();
+  BufferManager::Buffer* buffer_info = info->buffer();
   glBindBuffer(
       GL_ARRAY_BUFFER, buffer_info ? buffer_info->service_id() : 0);
   glVertexAttribPointer(
       attrib, info->size(), info->type(), info->normalized(),
       info->gl_stride(), ptr);
   if (info->divisor())
     glVertexAttribDivisorANGLE(attrib, info->divisor());
   // Never touch vertex attribute 0's state (in particular, never
   // disable it) when running on desktop GL because it will never be
   // re-enabled.
@@ skipping 46 matching lines @@
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/context_state_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu