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

gpu/command_buffer/service/context_group.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_
 #define GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_
 
 #include <string>
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
@@ skipping 18 matching lines @@
 class ShaderManager;
 class TextureManager;
 struct DisallowedExtensions;
 
 // A Context Group helps manage multiple GLES2Decoders that share
 // resources.
 class ContextGroup : public base::RefCounted<ContextGroup> {
  public:
   typedef scoped_refptr<ContextGroup> Ref;
 
-  ContextGroup();
+  explicit ContextGroup(bool bind_generates_resource);
   ~ContextGroup();
 
   // This should only be called by GLES2Decoder.
   bool Initialize(const DisallowedExtensions& disallowed_extensions,
                   const char* allowed_features);
 
   // Sets the ContextGroup has having a lost context.
   void set_have_context(bool have_context) {
     have_context_ = have_context;
   }
 
+  bool bind_generates_resource() {
+    return bind_generates_resource_;
+  }
+
   uint32 max_vertex_attribs() const {
     return max_vertex_attribs_;
   }
 
   uint32 max_texture_units() const {
     return max_texture_units_;
   }
 
   uint32 max_texture_image_units() const {
     return max_texture_image_units_;
@@ skipping 45 matching lines @@
 
   IdAllocatorInterface* GetIdAllocator(unsigned namespace_id);
 
  private:
   // Destroys all the resources.
   void Destroy();
 
   // Whether or not this context is initialized.
   bool initialized_;
   bool have_context_;
+  bool bind_generates_resource_;
 
   uint32 max_vertex_attribs_;
   uint32 max_texture_units_;
   uint32 max_texture_image_units_;
   uint32 max_vertex_texture_image_units_;
   uint32 max_fragment_uniform_vectors_;
   uint32 max_varying_vectors_;
   uint32 max_vertex_uniform_vectors_;
 
   scoped_ptr<BufferManager> buffer_manager_;
@@ skipping 15 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContextGroup);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_GROUP_H_