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_SURFACE_GLX_H_ | 5 #ifndef UI_GL_GL_SURFACE_GLX_H_ |
6 #define UI_GL_GL_SURFACE_GLX_H_ | 6 #define UI_GL_GL_SURFACE_GLX_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 | 69 |
70 virtual void GetVSyncParameters( | 70 virtual void GetVSyncParameters( |
71 const GLSurface::UpdateVSyncCallback& callback) = 0; | 71 const GLSurface::UpdateVSyncCallback& callback) = 0; |
72 }; | 72 }; |
73 | 73 |
74 protected: | 74 protected: |
75 NativeViewGLSurfaceGLX(); | 75 NativeViewGLSurfaceGLX(); |
76 virtual ~NativeViewGLSurfaceGLX(); | 76 virtual ~NativeViewGLSurfaceGLX(); |
77 | 77 |
78 gfx::AcceleratedWidget window_; | 78 gfx::AcceleratedWidget window_; |
| 79 XID glx_window_; |
79 | 80 |
80 private: | 81 private: |
81 void* config_; | 82 void* config_; |
82 gfx::Size size_; | 83 gfx::Size size_; |
83 | 84 |
84 scoped_ptr<VSyncProvider> vsync_provider_; | 85 scoped_ptr<VSyncProvider> vsync_provider_; |
85 | 86 |
86 DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceGLX); | 87 DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceGLX); |
87 }; | 88 }; |
88 | 89 |
(...skipping 18 matching lines...) Expand all Loading... |
107 gfx::Size size_; | 108 gfx::Size size_; |
108 void* config_; | 109 void* config_; |
109 XID pbuffer_; | 110 XID pbuffer_; |
110 | 111 |
111 DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceGLX); | 112 DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceGLX); |
112 }; | 113 }; |
113 | 114 |
114 } // namespace gfx | 115 } // namespace gfx |
115 | 116 |
116 #endif // UI_GL_GL_SURFACE_GLX_H_ | 117 #endif // UI_GL_GL_SURFACE_GLX_H_ |
OLD | NEW |