Fix standalone gl demos and conformance tests

gpu/demos/framework/window.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/demos/framework/window.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 16 matching lines @@
 
 namespace gpu {
 namespace demos {
 
 Window::Window()
   : window_handle_(NULL),
     demo_(CreateDemo()) {
 }
 
 Window::~Window() {
+  if (decoder_.get()) {
+    decoder_->Destroy();
+  }
 }
 
 bool Window::Init(int width, int height) {
   window_handle_ = CreateNativeWindow(demo_->Title(), width, height);
   if (window_handle_ == NULL)
     return false;
   if (!CreateRenderContext(PluginWindow(window_handle_)))
     return false;
 
   demo_->Resize(width, height);
@@ skipping 38 matching lines @@
                             gfx::Size(),
                             gpu::gles2::DisallowedFeatures(),
                             NULL,
                             attribs)) {
     return false;
   }
 
   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))
     return false;
 
   int32 transfer_buffer_id =
       command_buffer_->CreateTransferBuffer(kTransferBufferSize, -1);
   Buffer transfer_buffer =
       command_buffer_->GetTransferBuffer(transfer_buffer_id);
   if (transfer_buffer.ptr == NULL) return false;
 
   ::gles2::Initialize();
   ::gles2::SetGLContext(new GLES2Implementation(gles2_cmd_helper_.get(),
                                                 transfer_buffer.size,
                                                 transfer_buffer.ptr,
                                                 transfer_buffer_id,
                                                 false,
                                                 true));
   return true;
 }
 
 }  // namespace demos
 }  // namespace gpu