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

webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.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.
 
 #if defined(ENABLE_GPU)
 
 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 #include <GLES2/gl2.h>
 #ifndef GL_GLEXT_PROTOTYPES
@@ skipping 448 matching lines @@
         attribs.push_back(NONE);
         attrib_list = NULL;
         break;
     }
   }
 
   command_buffer_.reset(new CommandBufferService);
   if (!command_buffer_->Initialize(kCommandBufferSize))
     return false;
 
+  // TODO(gman): This needs to be true if this is Pepper.
+  bool bind_generates_resource = false;
   gpu_scheduler_ = GpuScheduler::Create(
       command_buffer_.get(),
       NULL,
       context_group ?
           context_group->gpu_scheduler_->decoder()->GetContextGroup() :
-              new ::gpu::gles2::ContextGroup);
+              new ::gpu::gles2::ContextGroup(bind_generates_resource));
 
   if (onscreen) {
     if (render_surface == gfx::kNullPluginWindow) {
       LOG(ERROR) << "Invalid surface handle for onscreen context.";
       command_buffer_.reset();
     } else {
       if (!gpu_scheduler_->Initialize(render_surface,
                                       gfx::Size(),
                                       false,
                                       ::gpu::gles2::DisallowedExtensions(),
@@ skipping 53 matching lines @@
     Destroy();
     return false;
   }
 
   // Create the object exposing the OpenGL API.
   gles2_implementation_ = new GLES2Implementation(
       gles2_helper_,
       transfer_buffer.size,
       transfer_buffer.ptr,
       transfer_buffer_id_,
-      true);
+      true,
+      false);
 
   size_ = size;
 
   return true;
 }
 
 void GLInProcessContext::Destroy() {
   if (parent_.get() && parent_texture_id_ != 0) {
     parent_->gles2_implementation_->FreeTextureId(parent_texture_id_);
     parent_texture_id_ = 0;
@@ skipping 1072 matching lines @@
   if (context_lost_callback_) {
     context_lost_callback_->onContextLost();
   }
 }
 
 }  // namespace gpu
 }  // namespace webkit
 
 #endif  // defined(ENABLE_GPU)