| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 extern "C" { | 5 extern "C" { |
| 6 #include <X11/Xlib.h> | 6 #include <X11/Xlib.h> |
| 7 } | 7 } |
| 8 | 8 |
| 9 #include "ui/gl/gl_context_glx.h" | 9 #include "ui/gl/gl_context_glx.h" |
| 10 | 10 |
| 11 #include "base/debug/trace_event.h" | 11 #include "base/debug/trace_event.h" |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "gpu/GL/glextchromium.h" |
| 14 #include "third_party/mesa/MesaLib/include/GL/osmesa.h" | 15 #include "third_party/mesa/MesaLib/include/GL/osmesa.h" |
| 15 #include "ui/gl/gl_bindings.h" | 16 #include "ui/gl/gl_bindings.h" |
| 16 #include "ui/gl/gl_implementation.h" | 17 #include "ui/gl/gl_implementation.h" |
| 17 #include "ui/gl/gl_surface_glx.h" | 18 #include "ui/gl/gl_surface_glx.h" |
| 18 | 19 |
| 19 namespace gfx { | 20 namespace gfx { |
| 20 | 21 |
| 21 namespace { | 22 namespace { |
| 22 | 23 |
| 23 // scoped_ptr functor for XFree(). Use as follows: | 24 // scoped_ptr functor for XFree(). Use as follows: |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 | 219 |
| 219 bool GLContextGLX::WasAllocatedUsingRobustnessExtension() { | 220 bool GLContextGLX::WasAllocatedUsingRobustnessExtension() { |
| 220 return GLSurfaceGLX::IsCreateContextRobustnessSupported(); | 221 return GLSurfaceGLX::IsCreateContextRobustnessSupported(); |
| 221 } | 222 } |
| 222 | 223 |
| 223 GLContextGLX::~GLContextGLX() { | 224 GLContextGLX::~GLContextGLX() { |
| 224 Destroy(); | 225 Destroy(); |
| 225 } | 226 } |
| 226 | 227 |
| 227 } // namespace gfx | 228 } // namespace gfx |
| OLD | NEW |