Change X11 error handler override to allow easy X11 error checking.

gpu/command_buffer/service/gles2_cmd_decoder.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/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <list>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/atomicops.h"
 #include "base/at_exit.h"
 #include "base/callback.h"
+#include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #define GLES2_GPU_SERVICE 1
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/common/id_allocator.h"
 #include "gpu/command_buffer/common/trace_event.h"
 #include "gpu/command_buffer/service/buffer_manager.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/gles2_cmd_validation.h"
 #include "gpu/command_buffer/service/program_manager.h"
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
 #include "gpu/command_buffer/service/shader_manager.h"
 #include "gpu/command_buffer/service/shader_translator.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "gpu/command_buffer/service/vertex_attrib_manager.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_implementation.h"
 #include "ui/gfx/gl/gl_surface.h"
 
+#if defined(USE_X11)
+#define Status int
+
+#include "ui/base/x/x11_util.h"
+#include "ui/base/x/x11_util_internal.h"
+#include "ui/gfx/gl/gl_surface_glx.h"
+#define CHECK_X_ERROR() do { \

[Ami GONE FROM CHROMIUM, 2011/09/14 23:23:11]

Why not put this in the x11_util_internal.h header?

+    CHECK(!ui::GetLastX11Error(gfx::GLSurfaceGLX::GetDisplay())); \

[Ami GONE FROM CHROMIUM, 2011/09/14 23:23:11]

Can this be simplified by calling XGetDisplay() (inside GetLastX11Error())?

[Ami GONE FROM CHROMIUM, 2011/09/14 23:23:11]

In fact since this is the only use, you might reduce the API surface by only
offering a ui::CheckFailOnX11Error() method instead of the general getter.

+  } while(0)
+#else   // USE_X11
+#define CHECK_X_ERROR() void(0)
+#endif  // USE_X11
+
 #if !defined(GL_DEPTH24_STENCIL8)
 #define GL_DEPTH24_STENCIL8 0x88F0
 #endif
 
 namespace gpu {
 namespace gles2 {
 
 class GLES2DecoderImpl;
 
 // Check that certain assumptions the code makes are true. There are places in
@@ skipping 1670 matching lines @@
   // Take ownership of the GLSurface. TODO(apatrick): once the parent / child
   // context is retired, the decoder should not take an initial surface as
   // an argument to this function.
   // Maybe create a short lived offscreen GLSurface for the purpose of
   // initializing the decoder's GLContext.
   surface_ = surface;
 
   // Take ownership of the GLContext.
   context_ = context;
 
+  CHECK_X_ERROR();
+
   if (!MakeCurrent()) {
     LOG(ERROR) << "GLES2DecoderImpl::Initialize failed because "
                << "MakeCurrent failed.";
     Destroy();
     return false;
   }
 
   if (!group_->Initialize(disallowed_extensions, allowed_extensions)) {
     LOG(ERROR) << "GpuScheduler::InitializeCommon failed because group "
                << "failed to initialize.";
     Destroy();
     return false;
   }
 
+  CHECK_X_ERROR();
   CHECK_GL_ERROR();
   disallowed_extensions_ = disallowed_extensions;
 
   vertex_attrib_manager_.Initialize(group_->max_vertex_attribs());
 
   util_.set_num_compressed_texture_formats(
       validators_->compressed_texture_format.GetValues().size());
 
   if (gfx::GetGLImplementation() != gfx::kGLImplementationEGLGLES2) {
     // We have to enable vertex array 0 on OpenGL or it won't render. Note that
@@ skipping 5113 matching lines @@
   return false;
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu