base::Bind() conversion for remaining GPU files.

webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.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.
 
 #if defined(ENABLE_GPU)
 
 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 #include <GLES2/gl2.h>
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
 #include <GLES2/gl2ext.h>
 
 #include <algorithm>
 #include <set>
 
-#include "base/string_tokenizer.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/callback.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "base/memory/singleton.h"
 #include "base/message_loop.h"
-#include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
+#include "base/string_tokenizer.h"
 #include "base/synchronization/lock.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
@@ skipping 95 matching lines @@
 
   // Create a new texture in the parent's GLInProcessContext.  Returns zero if
   // GLInProcessContext does not have a parent.
   uint32 CreateParentTexture(const gfx::Size& size);
 
   // Deletes a texture in the parent's GLInProcessContext.
   void DeleteParentTexture(uint32 texture);
 
   // Provides a callback that will be invoked when SwapBuffers has completed
   // service side.
-  void SetSwapBuffersCallback(Callback0::Type* callback);
+  void SetSwapBuffersCallback(const base::Closure& callback);
 
-  void SetContextLostCallback(Callback0::Type* callback);
+  void SetContextLostCallback(const base::Closure& callback);
 
   // Set the current GLInProcessContext for the calling thread.
   static bool MakeCurrent(GLInProcessContext* context);
 
   // For a view GLInProcessContext, display everything that has been rendered
   // since the last call. For an offscreen GLInProcessContext, resolve
   // everything that has been rendered since the last call to a copy that can be
   // accessed by the parent GLInProcessContext.
   bool SwapBuffers();
 
@@ skipping 23 matching lines @@
                   const char* allowed_extensions,
                   const int32* attrib_list,
                   const GURL& active_url,
                   gfx::GpuPreference gpu_preference);
   void Destroy();
 
   void OnSwapBuffers();
   void OnContextLost();
 
   base::WeakPtr<GLInProcessContext> parent_;
-  scoped_ptr<Callback0::Type> swap_buffers_callback_;
-  scoped_ptr<Callback0::Type> context_lost_callback_;
+  base::Closure swap_buffers_callback_;
+  base::Closure context_lost_callback_;
   uint32 parent_texture_id_;
   scoped_ptr<CommandBufferService> command_buffer_;
   scoped_ptr< ::gpu::GpuScheduler> gpu_scheduler_;
   scoped_ptr< ::gpu::gles2::GLES2Decoder> decoder_;
   scoped_refptr<gfx::GLContext> context_;
   scoped_refptr<gfx::GLSurface> surface_;
   scoped_ptr<GLES2CmdHelper> gles2_helper_;
   int32 transfer_buffer_id_;
   scoped_ptr<GLES2Implementation> gles2_implementation_;
   Error last_error_;
@@ skipping 118 matching lines @@
   uint32 texture = 0;
   gles2_implementation_->GenTextures(1, &texture);
   gles2_implementation_->Flush();
   return texture;
 }
 
 void GLInProcessContext::DeleteParentTexture(uint32 texture) {
   gles2_implementation_->DeleteTextures(1, &texture);
 }
 
-void GLInProcessContext::SetSwapBuffersCallback(Callback0::Type* callback) {
-  swap_buffers_callback_.reset(callback);
+void GLInProcessContext::SetSwapBuffersCallback(const base::Closure& callback) {
+  swap_buffers_callback_ = callback;
 }
 
-void GLInProcessContext::SetContextLostCallback(Callback0::Type* callback) {
-  context_lost_callback_.reset(callback);
+void GLInProcessContext::SetContextLostCallback(const base::Closure& callback) {
+  context_lost_callback_ = callback;
 }
 
 bool GLInProcessContext::MakeCurrent(GLInProcessContext* context) {
   if (context) {
     gles2::SetGLContext(context->gles2_implementation_.get());
 
     // Don't request latest error status from service. Just use the locally
     // cached information from the last flush.
     // TODO(apatrick): I'm not sure if this should actually change the
     // current context if it fails. For now it gets changed even if it fails
@@ skipping 170 matching lines @@
 
   if (!decoder_->SetParent(
       parent_.get() ? parent_->decoder_.get() : NULL,
       parent_texture_id_)) {
     LOG(ERROR) << "Could not set parent.";
     Destroy();
     return false;
   }
 
   command_buffer_->SetPutOffsetChangeCallback(
-      NewCallback(this, &GLInProcessContext::PumpCommands));
+      base::Bind(&GLInProcessContext::PumpCommands, base::Unretained(this)));
 
   // Create the GLES2 helper, which writes the command buffer protocol.
   gles2_helper_.reset(new GLES2CmdHelper(command_buffer_.get()));
   if (!gles2_helper_->Initialize(kCommandBufferSize)) {
     Destroy();
     return false;
   }
 
   // Create a transfer buffer.
   transfer_buffer_id_ =
@@ skipping 45 matching lines @@
     command_buffer_->DestroyTransferBuffer(transfer_buffer_id_);
     transfer_buffer_id_ = -1;
   }
 
   gles2_helper_.reset();
 
   command_buffer_.reset();
 }
 
 void GLInProcessContext::OnSwapBuffers() {
-  if (swap_buffers_callback_.get())
-    swap_buffers_callback_->Run();
+  if (!swap_buffers_callback_.is_null())
+    swap_buffers_callback_.Run();
 }
 
 void GLInProcessContext::OnContextLost() {
-  if (context_lost_callback_.get())
-    context_lost_callback_->Run();
+  if (!context_lost_callback_.is_null())
+    context_lost_callback_.Run();
 }
 
 WebGraphicsContext3DInProcessCommandBufferImpl::
     WebGraphicsContext3DInProcessCommandBufferImpl()
     : context_(NULL),
       gl_(NULL),
       web_view_(NULL),
 #if defined(OS_MACOSX)
       plugin_handle_(NULL),
 #endif  // defined(OS_MACOSX)
-      context_lost_callback_(0),
+      context_lost_callback_(NULL),
       context_lost_reason_(GL_NO_ERROR),
       cached_width_(0),
       cached_height_(0),
       bound_fbo_(0) {
 }
 
 WebGraphicsContext3DInProcessCommandBufferImpl::
     ~WebGraphicsContext3DInProcessCommandBufferImpl() {
   base::AutoLock a(g_all_shared_contexts_lock.Get());
   g_all_shared_contexts.Pointer()->erase(this);
@@ skipping 62 matching lines @@
 
   if (!context_)
     return false;
 
   gl_ = context_->GetImplementation();
 
   if (gl_ && attributes.noExtensions)
     gl_->EnableFeatureCHROMIUM("webgl_enable_glsl_webgl_validation");
 
   context_->SetContextLostCallback(
-      NewCallback(
-          this,
-          &WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost));
+      base::Bind(
+          &WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost,
+          base::Unretained(this)));
 
   // Set attributes_ from created offscreen context.
   {
     attributes_ = attributes;
     GLint alpha_bits = 0;
     getIntegerv(GL_ALPHA_BITS, &alpha_bits);
     attributes_.alpha = alpha_bits > 0;
     GLint depth_bits = 0;
     getIntegerv(GL_DEPTH_BITS, &depth_bits);
     attributes_.depth = depth_bits > 0;
@@ skipping 971 matching lines @@
   context_lost_reason_ = GL_UNKNOWN_CONTEXT_RESET_ARB;
   if (context_lost_callback_) {
     context_lost_callback_->onContextLost();
   }
 }
 
 }  // namespace gpu
 }  // namespace webkit
 
 #endif  // defined(ENABLE_GPU)