Make lost context and error message callbacks on GpuControl go to client

content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.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 "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 
 #include "third_party/khronos/GLES2/gl2.h"
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
@@ skipping 102 matching lines @@
   } else if (share_resources) {
     share_group_ = GetDefaultShareGroupForHost(host);
   } else {
     share_group_ = make_scoped_refptr(new ShareGroup);
   }
 }
 
 WebGraphicsContext3DCommandBufferImpl::
     ~WebGraphicsContext3DCommandBufferImpl() {
   if (real_gl_) {
-    real_gl_->SetErrorMessageCallback(NULL);
+    real_gl_->SetErrorMessageCallback(
+        base::Callback<void(const char*, int32_t)>());
+    real_gl_->SetLostContextCallback(base::Closure());
   }
 
   Destroy();
 }
 
 bool WebGraphicsContext3DCommandBufferImpl::MaybeInitializeGL() {
   if (initialized_)
     return true;
 
   if (initialize_failed_)
     return false;
 
   TRACE_EVENT0("gpu", "WebGfxCtx3DCmdBfrImpl::MaybeInitializeGL");
 
   // TODO(vadimt): Remove ScopedTracker below once crbug.com/125248 is fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "125248 WebGraphicsContext3DCommandBufferImpl::MaybeInitializeGL"));
 
   if (!CreateContext()) {
     Destroy();
 
     initialize_failed_ = true;
     return false;
   }
 
-  command_buffer_->SetContextLostCallback(
+  real_gl_->SetErrorMessageCallback(
+      base::Bind(&WebGraphicsContext3DCommandBufferImpl::OnErrorMessage,
+                 // The callback is unset in the destructor.
+                 base::Unretained(this)));
+  real_gl_->SetLostContextCallback(
       base::Bind(&WebGraphicsContext3DCommandBufferImpl::OnContextLost,
-                 weak_ptr_factory_.GetWeakPtr()));
+                 // The callback is unset in the destructor.
+                 base::Unretained(this)));
 
-  command_buffer_->SetOnConsoleMessageCallback(
-      base::Bind(&WebGraphicsContext3DCommandBufferImpl::OnErrorMessage,
-                 weak_ptr_factory_.GetWeakPtr()));
-
-  real_gl_->SetErrorMessageCallback(getErrorMessageCallback());
   real_gl_->TraceBeginCHROMIUM("WebGraphicsContext3D",
                                "CommandBufferContext");
 
   initialized_ = true;
   return true;
 }
 
 bool WebGraphicsContext3DCommandBufferImpl::InitializeCommandBuffer(
     WebGraphicsContext3DCommandBufferImpl* share_context) {
   if (!host_.get())
@@ skipping 186 matching lines @@
   DCHECK(host_.get());
   {
     base::AutoLock lock(g_default_share_groups_lock.Get());
     g_default_share_groups.Get().erase(host_.get());
   }
 
   gpu::CommandBuffer::State state = command_buffer_->GetLastState();
   UmaRecordContextLost(context_type_, state.error, state.context_lost_reason);
 }
 
+void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage(const char* message,
+                                                           int id) {
+  if (error_message_callback_) {
+    blink::WebString str = blink::WebString::fromUTF8(message);
+    error_message_callback_->onErrorMessage(str, id);
+  }
+}
+
 }  // namespace content