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

content/renderer/gpu/renderer_gl_context.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.
 
 // This API is consistent with other OpenGL setup APIs like window's WGL
 // and pepper's PGL. This API is used to manage OpenGL RendererGLContexts in the
 // Chrome renderer process in a way that is consistent with other platforms.
 
 #ifndef CONTENT_RENDERER_GPU_RENDERER_GL_CONTEXT_H_
 #define CONTENT_RENDERER_GPU_RENDERER_GL_CONTEXT_H_
@@ skipping 174 matching lines @@
 
   CommandBufferProxy* GetCommandBufferProxy();
 
  private:
   explicit RendererGLContext(GpuChannelHost* channel);
 
   bool Initialize(bool onscreen,
                   int render_view_id,
                   const gfx::Size& size,
                   bool share_resources,
+                  bool bind_generates_resource,
                   RendererGLContext* share_group,
                   const char* allowed_extensions,
                   const int32* attrib_list,
                   const GURL& active_url);
   void Destroy();
 
   void OnSwapBuffers();
   void OnContextLost();
 
   scoped_refptr<GpuChannelHost> channel_;
   base::WeakPtr<RendererGLContext> parent_;
   scoped_ptr<Callback0::Type> swap_buffers_callback_;
   scoped_ptr<Callback1<ContextLostReason>::Type> context_lost_callback_;
   uint32 parent_texture_id_;
   CommandBufferProxy* command_buffer_;
   gpu::gles2::GLES2CmdHelper* gles2_helper_;
   int32 transfer_buffer_id_;
   gpu::gles2::GLES2Implementation* gles2_implementation_;
   gfx::Size size_;
   Error last_error_;
   int frame_number_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererGLContext);
 };
 
 #endif  // CONTENT_RENDERER_GPU_RENDERER_GL_CONTEXT_H_