Reland r264914

gpu/command_buffer/service/vertex_array_manager.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/vertex_array_manager.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
@@ skipping 10 matching lines @@
 VertexArrayManager::~VertexArrayManager() {
   DCHECK(vertex_attrib_managers_.empty());
   CHECK_EQ(vertex_attrib_manager_count_, 0u);
 }
 
 void VertexArrayManager::Destroy(bool have_context) {
   have_context_ = have_context;
   vertex_attrib_managers_.clear();
 }
 
-void VertexArrayManager::CreateVertexAttribManager(
-    GLuint client_id, GLuint service_id, uint32 num_vertex_attribs) {
+scoped_refptr<VertexAttribManager>
+VertexArrayManager::CreateVertexAttribManager(GLuint client_id,
+                                              GLuint service_id,
+                                              uint32 num_vertex_attribs,
+                                              bool client_visible) {
   scoped_refptr<VertexAttribManager> vertex_attrib_manager(
     new VertexAttribManager(this, service_id, num_vertex_attribs));
-  std::pair<VertexAttribManagerMap::iterator, bool> result =
-      vertex_attrib_managers_.insert(
-      std::make_pair(client_id, vertex_attrib_manager));
-  DCHECK(result.second);
+
+  if (client_visible) {
+    std::pair<VertexAttribManagerMap::iterator, bool> result =
+        vertex_attrib_managers_.insert(
+            std::make_pair(client_id, vertex_attrib_manager));
+    DCHECK(result.second);
+  }
+
+  return vertex_attrib_manager;
 }
 
 VertexAttribManager* VertexArrayManager::GetVertexAttribManager(
     GLuint client_id) {
   VertexAttribManagerMap::iterator it = vertex_attrib_managers_.find(client_id);
   return it != vertex_attrib_managers_.end() ? it->second.get() : NULL;
 }
 
 void VertexArrayManager::RemoveVertexAttribManager(GLuint client_id) {
   VertexAttribManagerMap::iterator it = vertex_attrib_managers_.find(client_id);
@@ skipping 25 matching lines @@
       return true;
     }
   }
   return false;
 }
 
 }  // namespace gles2
 }  // namespace gpu