Fix standalone gl demos and conformance tests

TEST=demos run
BUG=none


Review URL: http://codereview.chromium.org/8947016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114697 0039d316-1c4b-4281-b951-d872f2087c98

gpu/demos/framework/window.cc

@@ -34,6 +34,9 @@ Window::Window()
 }
 
 Window::~Window() {
+  if (decoder_.get()) {
+    decoder_->Destroy();
+  }
 }
 
 bool Window::Init(int width, int height) {
@@ -92,6 +95,9 @@ bool Window::CreateRenderContext(gfx::PluginWindowHandle hwnd) {
   command_buffer_->SetPutOffsetChangeCallback(
       base::Bind(&GpuScheduler::PutChanged,
                  base::Unretained(gpu_scheduler_.get())));
+  command_buffer_->SetGetBufferChangeCallback(
+      base::Bind(&GpuScheduler::SetGetBuffer,
+                 base::Unretained(gpu_scheduler_.get())));
 
   gles2_cmd_helper_.reset(new GLES2CmdHelper(command_buffer_.get()));
   if (!gles2_cmd_helper_->Initialize(kCommandBufferSize))

gpu/gles2_conform_support/egl/display.cc

@@ -138,6 +138,9 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config,
   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));
 
@@ -147,6 +150,9 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config,
 void Display::DestroySurface(EGLSurface surface) {
   DCHECK(IsValidSurface(surface));
   gpu_scheduler_.reset();
+  if (decoder_.get()) {
+    decoder_->Destroy();
+  }
   decoder_.reset();
   gl_surface_ = NULL;
   gl_context_ = NULL;