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

BUG=None
TEST=None


Review URL: http://codereview.chromium.org/7889040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102978 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 6 deletions

diff --git a/ui/gfx/gl/gl_bindings.h b/ui/gfx/gl/gl_bindings.h
index 8951225..af14f84 100644
--- a/ui/gfx/gl/gl_bindings.h
+++ b/ui/gfx/gl/gl_bindings.h
@@ -26,12 +26,6 @@
 #elif defined(USE_X11)
 #include <GL/glx.h>
 #include <GL/glxext.h>
-
-// Undefine some macros defined by X headers. This is why this file should only
-// be included in .cc files.
-#undef Bool
-#undef None
-#undef Status
 #endif
 
 #if defined(OS_WIN)
diff --git a/ui/gfx/gl/gl_context_glx.cc b/ui/gfx/gl/gl_context_glx.cc
index a23f1a9..e0ea25e 100644
--- a/ui/gfx/gl/gl_context_glx.cc
+++ b/ui/gfx/gl/gl_context_glx.cc
@@ -11,6 +11,7 @@ extern "C" {
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
+#include "ui/base/x/x11_util_internal.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/gl/gl_implementation.h"
 #include "ui/gfx/gl/gl_surface_glx.h"
@@ -88,6 +89,8 @@ bool GLContextGLX::Initialize(GLSurface* compatible_surface) {
     }
   }
 
+  ui::CheckForReportedX11Error();
+
   if (!context_) {
     // The means by which the context is created depends on whether
     // the drawable type works reliably with GLX 1.3. If it does not
@@ -113,6 +116,8 @@ bool GLContextGLX::Initialize(GLSurface* compatible_surface) {
         return false;
       }
 
+      ui::CheckForReportedX11Error();
+
       XVisualInfo visual_info_template;
       visual_info_template.visualid = XVisualIDFromVisual(attributes.visual);
 
@@ -136,6 +141,7 @@ bool GLContextGLX::Initialize(GLSurface* compatible_surface) {
           True);
     }
   }
+  ui::CheckForReportedX11Error();
 
   if (!context_) {
     LOG(ERROR) << "Couldn't create GL context.";