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

gpu/command_buffer/service/context_group.h

Index: gpu/command_buffer/service/context_group.h
===================================================================
--- gpu/command_buffer/service/context_group.h	(revision 98673)
+++ gpu/command_buffer/service/context_group.h	(working copy)
@@ -36,7 +36,7 @@
  public:
   typedef scoped_refptr<ContextGroup> Ref;
 
-  ContextGroup();
+  explicit ContextGroup(bool bind_generates_resource);
   ~ContextGroup();
 
   // This should only be called by GLES2Decoder.
@@ -48,6 +48,10 @@
     have_context_ = have_context;
   }
 
+  bool bind_generates_resource() {
+    return bind_generates_resource_;
+  }
+
   uint32 max_vertex_attribs() const {
     return max_vertex_attribs_;
   }
@@ -113,6 +117,7 @@
   // Whether or not this context is initialized.
   bool initialized_;
   bool have_context_;
+  bool bind_generates_resource_;
 
   uint32 max_vertex_attribs_;
   uint32 max_texture_units_;