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

content/common/gpu/gpu_command_buffer_stub.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 "base/bind.h"
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
 #include "base/process_util.h"
@@ skipping 38 matching lines @@
       requested_attribs_(attribs),
       route_id_(route_id),
       software_(software),
       last_flush_count_(0),
       renderer_id_(renderer_id),
       render_view_id_(render_view_id),
       parent_stub_for_initialization_(),
       parent_texture_for_initialization_(0),
       watchdog_(watchdog),
       task_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
-  if (share_group)
+  if (share_group) {
     context_group_ = share_group->context_group_;
-  else
-    context_group_ = new gpu::gles2::ContextGroup;
+  } else {
+    // TODO(gman): this needs to be false for everything but Pepper.
+    bool bind_generates_resource = true;
+    context_group_ = new gpu::gles2::ContextGroup(bind_generates_resource);
+  }
 }
 
 GpuCommandBufferStub::~GpuCommandBufferStub() {
   if (scheduler_.get()) {
     scheduler_->Destroy();
   }
 
   GpuChannelManager* gpu_channel_manager = channel_->gpu_channel_manager();
   gpu_channel_manager->Send(new GpuHostMsg_DestroyCommandBuffer(
       handle_, renderer_id_, render_view_id_));
@@ skipping 497 matching lines @@
       new GpuVideoDecodeAccelerator(this, route_id_, this));
   video_decoder_->Initialize(configs);
 }
 
 void GpuCommandBufferStub::OnDestroyVideoDecoder() {
   LOG(ERROR) << "GpuCommandBufferStub::OnDestroyVideoDecoder";
   video_decoder_.reset();
 }
 
 #endif  // defined(ENABLE_GPU)