Make Occlusion Query Sample

gpu/demos/framework/window.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/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 18 matching lines @@
 
 namespace gpu {
 namespace demos {
 
 Window::Window()
   : window_handle_(NULL),
     demo_(CreateDemo()) {
 }
 
 Window::~Window() {
+  demo_.reset();
+
+  // must free client before service.
+  gles2_implementation_.reset();
+  transfer_buffer_.reset();
+  gles2_cmd_helper_.reset();
+
   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_)))
@@ skipping 52 matching lines @@
       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;
 
   transfer_buffer_.reset(new gpu::TransferBuffer(gles2_cmd_helper_.get()));
 
   ::gles2::Initialize();
-  GLES2Implementation* gles2_implementation = new GLES2Implementation(
+  gles2_implementation_.reset(new GLES2Implementation(
       gles2_cmd_helper_.get(),
       transfer_buffer_.get(),
       false,
-      true);
+      true));
 
-  ::gles2::SetGLContext(gles2_implementation);
+  ::gles2::SetGLContext(gles2_implementation_.get());
 
-  if (!gles2_implementation->Initialize(
+  if (!gles2_implementation_->Initialize(
       kTransferBufferSize,
       kTransferBufferSize,
       kTransferBufferSize)) {
     return false;
   }
 
   return true;
 }
 
 }  // namespace demos
 }  // namespace gpu