Plumb client side synthesized GL messages to JS Console

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 26 matching lines @@
 
 namespace {
 
 void ClearSharedContexts() {
   base::AutoLock lock(g_all_shared_contexts_lock.Get());
   g_all_shared_contexts.Pointer()->clear();
 }
 
 } // namespace anonymous
 
+class WebGraphicsContext3DErrorMessageCallback
+    : public gpu::gles2::GLES2Implementation::ErrorMessageCallback {
+ public:
+  WebGraphicsContext3DErrorMessageCallback(
+      WebGraphicsContext3DCommandBufferImpl* context)
+      : context_(context) {
+  }
+
+  virtual void OnErrorMessage(const char* msg, int id) OVERRIDE;
+
+ private:
+  WebGraphicsContext3DCommandBufferImpl* context_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebGraphicsContext3DErrorMessageCallback);
+};
+
+void WebGraphicsContext3DErrorMessageCallback::OnErrorMessage(
+    const char* msg, int id) {
+  context_->OnErrorMessage(msg, id);
+}
 
 WebGraphicsContext3DCommandBufferImpl::WebGraphicsContext3DCommandBufferImpl(
     int surface_id,
     const GURL& active_url,
     GpuChannelHostFactory* factory,
     const base::WeakPtr<WebGraphicsContext3DSwapBuffersClient>& swap_client)
     : initialize_failed_(false),
       factory_(factory),
       context_(NULL),
       gl_(NULL),
       host_(NULL),
       surface_id_(surface_id),
       active_url_(active_url),
       swap_client_(swap_client),
       memory_allocation_changed_callback_(0),
       context_lost_callback_(0),
       context_lost_reason_(GL_NO_ERROR),
       error_message_callback_(0),
       swapbuffers_complete_callback_(0),
       gpu_preference_(gfx::PreferIntegratedGpu),
       cached_width_(0),
       cached_height_(0),
       bound_fbo_(0),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
 WebGraphicsContext3DCommandBufferImpl::
     ~WebGraphicsContext3DCommandBufferImpl() {
+  if (gl_) {
+    gl_->SetErrorMessageCallback(NULL);
+  }
+
   if (host_) {
     if (host_->WillGpuSwitchOccur(false, gpu_preference_)) {
       host_->ForciblyCloseChannel();
       ClearSharedContexts();
     }
   }
 
   {
     base::AutoLock lock(g_all_shared_contexts_lock.Get());
     g_all_shared_contexts.Pointer()->erase(this);
@@ skipping 121 matching lines @@
     gl_->EnableFeatureCHROMIUM("webgl_enable_glsl_webgl_validation");
 
   context_->SetContextLostCallback(
       base::Bind(&WebGraphicsContext3DCommandBufferImpl::OnContextLost,
                  weak_ptr_factory_.GetWeakPtr()));
 
   context_->GetCommandBufferProxy()->SetOnConsoleMessageCallback(
       base::Bind(&WebGraphicsContext3DCommandBufferImpl::OnErrorMessage,
                  weak_ptr_factory_.GetWeakPtr()));
 
+  client_error_message_callback_.reset(
+      new WebGraphicsContext3DErrorMessageCallback(this));
+  gl_->SetErrorMessageCallback(client_error_message_callback_.get());
+
   // TODO(gman): Remove this.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kDisableGLSLTranslator)) {
     context_->DisableShaderTranslation();
   }
 
   // Set attributes_ from created offscreen context.
   {
     GLint alpha_bits = 0;
     getIntegerv(GL_ALPHA_BITS, &alpha_bits);
@@ skipping 996 matching lines @@
 }
 
 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage(
     const std::string& message, int id) {
   if (error_message_callback_) {
     WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str());
     error_message_callback_->onErrorMessage(str, id);
   }
 }