| 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 "ui/base/x/x11_util.h" | 11 #include "ui/base/x/x11_util.h" |
| 12 #include "ui/gl/gl_context.h" | 12 #include "ui/gl/gl_context.h" |
| 13 #include "ui/gl/gl_export.h" | 13 #include "ui/gl/gl_export.h" |
| 14 | 14 |
| 15 namespace gfx { | 15 namespace gfx { |
| 16 | 16 |
| 17 class GLSurface; | 17 class GLSurface; |
| 18 | 18 |
| 19 // Encapsulates a GLX OpenGL context. | 19 // Encapsulates a GLX OpenGL context. |
| 20 class GL_EXPORT GLContextGLX : public GLContext { | 20 class GL_EXPORT GLContextGLX : public GLContextReal { |
| 21 public: | 21 public: |
| 22 explicit GLContextGLX(GLShareGroup* share_group); | 22 explicit GLContextGLX(GLShareGroup* share_group); |
| 23 | 23 |
| 24 Display* display(); | 24 Display* display(); |
| 25 | 25 |
| 26 // Implement GLContext. | 26 // Implement GLContext. |
| 27 virtual bool Initialize( | 27 virtual bool Initialize( |
| 28 GLSurface* compatible_surface, GpuPreference gpu_preference) OVERRIDE; | 28 GLSurface* compatible_surface, GpuPreference gpu_preference) OVERRIDE; |
| 29 virtual void Destroy() OVERRIDE; | 29 virtual void Destroy() OVERRIDE; |
| 30 virtual bool MakeCurrent(GLSurface* surface) OVERRIDE; | 30 virtual bool MakeCurrent(GLSurface* surface) OVERRIDE; |
| (...skipping 11 matching lines...) Expand all Loading... |
| 42 private: | 42 private: |
| 43 void* context_; | 43 void* context_; |
| 44 Display* display_; | 44 Display* display_; |
| 45 | 45 |
| 46 DISALLOW_COPY_AND_ASSIGN(GLContextGLX); | 46 DISALLOW_COPY_AND_ASSIGN(GLContextGLX); |
| 47 }; | 47 }; |
| 48 | 48 |
| 49 } // namespace gfx | 49 } // namespace gfx |
| 50 | 50 |
| 51 #endif // UI_GL_GL_CONTEXT_GLX_H_ | 51 #endif // UI_GL_GL_CONTEXT_GLX_H_ |
| OLD | NEW |