| 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 #ifndef UI_GL_GL_CONTEXT_GLX_H_ | 5 #ifndef UI_GL_GL_CONTEXT_GLX_H_ |
| 6 #define UI_GL_GL_CONTEXT_GLX_H_ | 6 #define UI_GL_GL_CONTEXT_GLX_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "ui/gfx/x/x11_types.h" | 12 #include "ui/gfx/x/x11_types.h" |
| 13 #include "ui/gl/gl_context.h" | 13 #include "ui/gl/gl_context.h" |
| 14 #include "ui/gl/gl_export.h" | 14 #include "ui/gl/gl_export.h" |
| 15 | 15 |
| 16 namespace gfx { | 16 namespace gl { |
| 17 | 17 |
| 18 class GLSurface; | 18 class GLSurface; |
| 19 | 19 |
| 20 // Encapsulates a GLX OpenGL context. | 20 // Encapsulates a GLX OpenGL context. |
| 21 class GL_EXPORT GLContextGLX : public GLContextReal { | 21 class GL_EXPORT GLContextGLX : public GLContextReal { |
| 22 public: | 22 public: |
| 23 explicit GLContextGLX(GLShareGroup* share_group); | 23 explicit GLContextGLX(GLShareGroup* share_group); |
| 24 | 24 |
| 25 XDisplay* display(); | 25 XDisplay* display(); |
| 26 | 26 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 40 | 40 |
| 41 private: | 41 private: |
| 42 void Destroy(); | 42 void Destroy(); |
| 43 | 43 |
| 44 void* context_; | 44 void* context_; |
| 45 XDisplay* display_; | 45 XDisplay* display_; |
| 46 | 46 |
| 47 DISALLOW_COPY_AND_ASSIGN(GLContextGLX); | 47 DISALLOW_COPY_AND_ASSIGN(GLContextGLX); |
| 48 }; | 48 }; |
| 49 | 49 |
| 50 } // namespace gfx | 50 } // namespace gl |
| 51 | 51 |
| 52 #endif // UI_GL_GL_CONTEXT_GLX_H_ | 52 #endif // UI_GL_GL_CONTEXT_GLX_H_ |
| OLD | NEW |