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 "ui/gfx/x/x11_types.h" | 12 #include "ui/gfx/x/x11_types.h" |
12 #include "ui/gl/gl_context.h" | 13 #include "ui/gl/gl_context.h" |
13 #include "ui/gl/gl_export.h" | 14 #include "ui/gl/gl_export.h" |
14 | 15 |
15 namespace gfx { | 16 namespace gfx { |
16 | 17 |
17 class GLSurface; | 18 class GLSurface; |
18 | 19 |
19 // Encapsulates a GLX OpenGL context. | 20 // Encapsulates a GLX OpenGL context. |
20 class GL_EXPORT GLContextGLX : public GLContextReal { | 21 class GL_EXPORT GLContextGLX : public GLContextReal { |
(...skipping 21 matching lines...) Expand all Loading... |
42 | 43 |
43 void* context_; | 44 void* context_; |
44 XDisplay* display_; | 45 XDisplay* display_; |
45 | 46 |
46 DISALLOW_COPY_AND_ASSIGN(GLContextGLX); | 47 DISALLOW_COPY_AND_ASSIGN(GLContextGLX); |
47 }; | 48 }; |
48 | 49 |
49 } // namespace gfx | 50 } // namespace gfx |
50 | 51 |
51 #endif // UI_GL_GL_CONTEXT_GLX_H_ | 52 #endif // UI_GL_GL_CONTEXT_GLX_H_ |
OLD | NEW |