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

gpu/gles2_conform_support/egl/display.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.
 
 #include "gpu/gles2_conform_support/egl/display.h"
 
 #include <vector>
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
+#include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "gpu/GLES2/gles2_command_buffer.h"
 #include "gpu/gles2_conform_support/egl/config.h"
 #include "gpu/gles2_conform_support/egl/surface.h"
 
 namespace {
 const int32 kCommandBufferSize = 1024 * 1024;
 const int32 kTransferBufferSize = 512 * 1024;
 }
@@ skipping 81 matching lines @@
 EGLSurface Display::CreateWindowSurface(EGLConfig config,
                                         EGLNativeWindowType win,
                                         const EGLint* attrib_list) {
   if (surface_ != NULL) {
     // We do not support more than one window surface.
     return EGL_NO_SURFACE;
   }
 
   using gpu::GpuScheduler;
   std::vector<int32> attribs;
+  gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(true));
   scoped_ptr<GpuScheduler> gpu_scheduler(
       GpuScheduler::Create(command_buffer_.get(),
                            NULL,
                            NULL));
   if (!gpu_scheduler->Initialize(
       win, gfx::Size(), false, gpu::gles2::DisallowedExtensions(), NULL,
       attribs, NULL))
     return EGL_NO_SURFACE;
 
   command_buffer_->SetPutOffsetChangeCallback(
@@ skipping 31 matching lines @@
   DCHECK(transfer_buffer_id_ != -1);
   gpu::Buffer buffer = command_buffer_->GetTransferBuffer(transfer_buffer_id_);
   DCHECK(buffer.ptr != NULL);
   bool share_resources = share_ctx != NULL;
   using gpu::gles2::GLES2Implementation;
   context_.reset(new GLES2Implementation(
       gles2_cmd_helper_.get(),
       buffer.size,
       buffer.ptr,
       transfer_buffer_id_,
-      share_resources));
+      share_resources,
+      true));
 
   context_->CommandBufferEnableCHROMIUM(
       PEPPER3D_ALLOW_BUFFERS_ON_MULTIPLE_TARGETS);
   context_->CommandBufferEnableCHROMIUM(
       PEPPER3D_SUPPORT_FIXED_ATTRIBS);
 
   return context_.get();
 }
 
 void Display::DestroyContext(EGLContext ctx) {
   DCHECK(IsValidContext(ctx));
   context_.reset();
 }
 
 bool Display::MakeCurrent(EGLSurface draw, EGLSurface read, EGLContext ctx) {
   if (ctx == EGL_NO_CONTEXT) {
     gles2::SetGLContext(NULL);
   } else {
     DCHECK(IsValidSurface(draw));
     DCHECK(IsValidSurface(read));
     DCHECK(IsValidContext(ctx));
     gles2::SetGLContext(context_.get());
   }
   return true;
 }
 
 }  // namespace egl