| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_GFX_GL_GL_SURFACE_GLX_H_ | 5 #ifndef UI_GFX_GL_GL_SURFACE_GLX_H_ |
| 6 #define UI_GFX_GL_GL_SURFACE_GLX_H_ | 6 #define UI_GFX_GL_GL_SURFACE_GLX_H_ |
| 7 | 7 |
| 8 #include "ui/gfx/gl/gl_surface.h" | 8 #include "ui/gfx/gl/gl_surface.h" |
| 9 | 9 |
| 10 #include "ui/base/x/x11_util.h" | 10 #include "ui/base/x/x11_util.h" |
| 11 #include "ui/gfx/gl/gl_export.h" | |
| 12 #include "ui/gfx/native_widget_types.h" | 11 #include "ui/gfx/native_widget_types.h" |
| 13 #include "ui/gfx/size.h" | 12 #include "ui/gfx/size.h" |
| 14 | 13 |
| 15 namespace gfx { | 14 namespace gfx { |
| 16 | 15 |
| 17 // Base class for GLX surfaces. | 16 // Base class for GLX surfaces. |
| 18 class GL_EXPORT GLSurfaceGLX : public GLSurface { | 17 class GLSurfaceGLX : public GLSurface { |
| 19 public: | 18 public: |
| 20 GLSurfaceGLX(); | 19 GLSurfaceGLX(); |
| 21 virtual ~GLSurfaceGLX(); | 20 virtual ~GLSurfaceGLX(); |
| 22 | 21 |
| 23 static bool InitializeOneOff(); | 22 static bool InitializeOneOff(); |
| 24 static Display* GetDisplay(); | 23 static Display* GetDisplay(); |
| 25 | 24 |
| 26 // These aren't particularly tied to surfaces, but since we already | 25 // These aren't particularly tied to surfaces, but since we already |
| 27 // have the static InitializeOneOff here, it's easiest to reuse its | 26 // have the static InitializeOneOff here, it's easiest to reuse its |
| 28 // initialization guards. | 27 // initialization guards. |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 private: | 80 private: |
| 82 gfx::Size size_; | 81 gfx::Size size_; |
| 83 void* config_; | 82 void* config_; |
| 84 XID pbuffer_; | 83 XID pbuffer_; |
| 85 DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceGLX); | 84 DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceGLX); |
| 86 }; | 85 }; |
| 87 | 86 |
| 88 } // namespace gfx | 87 } // namespace gfx |
| 89 | 88 |
| 90 #endif // UI_GFX_GL_GL_SURFACE_GLX_H_ | 89 #endif // UI_GFX_GL_GL_SURFACE_GLX_H_ |
| OLD | NEW |