Fix standalone gl demos and conformance tests

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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
@@ skipping 120 matching lines @@
                             gfx::Size(),
                             gpu::gles2::DisallowedFeatures(),
                             NULL,
                             attribs)) {
     return EGL_NO_SURFACE;
   }
 
   command_buffer_->SetPutOffsetChangeCallback(
       base::Bind(&gpu::GpuScheduler::PutChanged,
                  base::Unretained(gpu_scheduler_.get())));
+  command_buffer_->SetGetBufferChangeCallback(
+      base::Bind(&gpu::GpuScheduler::SetGetBuffer,
+                 base::Unretained(gpu_scheduler_.get())));
 
   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_.reset();
   gl_surface_ = NULL;
   gl_context_ = NULL;
   surface_.reset();
 }
 
 void Display::SwapBuffers(EGLSurface surface) {
   DCHECK(IsValidSurface(surface));
   context_->SwapBuffers();
 }
@@ skipping 40 matching lines @@
   } else {
     DCHECK(IsValidSurface(draw));
     DCHECK(IsValidSurface(read));
     DCHECK(IsValidContext(ctx));
     gles2::SetGLContext(context_.get());
   }
   return true;
 }
 
 }  // namespace egl