Allow GLES2CmdDecoder to change the GLSurface associated with the default FBO.

gpu/gles2_conform_support/egl/display.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
@@ skipping 91 matching lines @@
   gl_surface_ = gfx::GLSurface::CreateViewGLSurface(false, win);
   if (!gl_surface_.get())
     return EGL_NO_SURFACE;
 
   gl_context_ = gfx::GLContext::CreateGLContext(NULL,
                                                 gl_surface_.get(),
                                                 gfx::PreferDiscreteGpu);
   if (!gl_context_.get())
     return EGL_NO_SURFACE;
 
+  gl_context_->MakeCurrent(gl_surface_);
+
   std::vector<int32> attribs;
   if (!decoder_->Initialize(gl_surface_.get(),
                             gl_context_.get(),
                             gl_surface_->IsOffscreen(),
                             gfx::Size(),
                             gpu::gles2::DisallowedFeatures(),
                             NULL,
                             attribs)) {
     return EGL_NO_SURFACE;
   }
@@ skipping 18 matching lines @@
   gles2_cmd_helper_.reset(cmd_helper.release());
   surface_.reset(new Surface(win));
 
   return surface_.get();
 }
 
 void Display::DestroySurface(EGLSurface surface) {
   DCHECK(IsValidSurface(surface));
   gpu_scheduler_.reset();
   if (decoder_.get()) {
-    decoder_->Destroy();
+    decoder_->Destroy(true);
   }
   decoder_.reset();
   gl_surface_ = NULL;
   gl_context_ = NULL;
   surface_.reset();
 }
 
 void Display::SwapBuffers(EGLSurface surface) {
   DCHECK(IsValidSurface(surface));
   context_->SwapBuffers();
@@ skipping 46 matching lines @@
   } else {
     DCHECK(IsValidSurface(draw));
     DCHECK(IsValidSurface(read));
     DCHECK(IsValidContext(ctx));
     gles2::SetGLContext(context_.get());
   }
   return true;
 }
 
 }  // namespace egl