Manually merging trunk revs 95836 and 96904 to 835 branch (third attempt, nacl should be fixed)

gpu/command_buffer/service/context_group.cc

 // Copyright (c) 2011 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_group.h"
 #include "gpu/command_buffer/common/id_allocator.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/program_manager.h"
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
 #include "gpu/command_buffer/service/shader_manager.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "gpu/GLES2/gles2_command_buffer.h"
 #include "ui/gfx/gl/gl_implementation.h"
 
 namespace gpu {
 namespace gles2 {
 
-ContextGroup::ContextGroup()
+ContextGroup::ContextGroup(bool bind_generates_resource)
     : initialized_(false),
       have_context_(true),
+      bind_generates_resource_(bind_generates_resource),
       max_vertex_attribs_(0u),
       max_texture_units_(0u),
       max_texture_image_units_(0u),
       max_vertex_texture_image_units_(0u),
       max_fragment_uniform_vectors_(0u),
       max_varying_vectors_(0u),
       max_vertex_uniform_vectors_(0u) {
   id_namespaces_[id_namespaces::kBuffers].reset(new IdAllocator);
   id_namespaces_[id_namespaces::kFramebuffers].reset(new IdAllocator);
   id_namespaces_[id_namespaces::kProgramsAndShaders].reset(
@@ skipping 122 matching lines @@
   if (namespace_id >= arraysize(id_namespaces_))
     return NULL;
 
   return id_namespaces_[namespace_id].get();
 }
 
 }  // namespace gles2
 }  // namespace gpu