Index: ui/gfx/gl/gl_context_glx.cc |
diff --git a/ui/gfx/gl/gl_context_glx.cc b/ui/gfx/gl/gl_context_glx.cc |
index a23f1a9b988063d7c7f84db3253fa23d6b3b4bc9..a8331e2491eccde89fa7c82c8a36a2e9f2007adc 100644 |
--- a/ui/gfx/gl/gl_context_glx.cc |
+++ b/ui/gfx/gl/gl_context_glx.cc |
@@ -11,6 +11,8 @@ 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.h" |
Ami GONE FROM CHROMIUM
2011/09/20 23:45:51
Why this file?
dominich
2011/09/21 19:47:30
Done.
|
+#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 +90,8 @@ bool GLContextGLX::Initialize(GLSurface* compatible_surface) { |
} |
} |
+ ui::CheckFailOnX11Error(); |
+ |
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 +117,8 @@ bool GLContextGLX::Initialize(GLSurface* compatible_surface) { |
return false; |
} |
+ ui::CheckFailOnX11Error(); |
+ |
XVisualInfo visual_info_template; |
visual_info_template.visualid = XVisualIDFromVisual(attributes.visual); |
@@ -136,6 +142,7 @@ bool GLContextGLX::Initialize(GLSurface* compatible_surface) { |
True); |
} |
} |
+ ui::CheckFailOnX11Error(); |
if (!context_) { |
LOG(ERROR) << "Couldn't create GL context."; |