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 NativeViewGLSurfaceGLX(); | 69 NativeViewGLSurfaceGLX(); |
70 virtual ~NativeViewGLSurfaceGLX(); | 70 virtual ~NativeViewGLSurfaceGLX(); |
71 | 71 |
72 private: | 72 private: |
73 // The handle for the drawable to make current or swap. | 73 // The handle for the drawable to make current or swap. |
74 gfx::AcceleratedWidget GetDrawableHandle() const; | 74 gfx::AcceleratedWidget GetDrawableHandle() const; |
75 | 75 |
76 // Window passed in at creation. Always valid. | 76 // Window passed in at creation. Always valid. |
77 gfx::AcceleratedWidget parent_window_; | 77 gfx::AcceleratedWidget parent_window_; |
78 | 78 |
| 79 // Child window, used to control resizes so that they're in-order with GL. |
| 80 gfx::AcceleratedWidget window_; |
| 81 |
79 void* config_; | 82 void* config_; |
80 gfx::Size size_; | 83 gfx::Size size_; |
81 | 84 |
82 scoped_ptr<VSyncProvider> vsync_provider_; | 85 scoped_ptr<VSyncProvider> vsync_provider_; |
83 | 86 |
84 DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceGLX); | 87 DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceGLX); |
85 }; | 88 }; |
86 | 89 |
87 // A surface used to render to an offscreen pbuffer. | 90 // A surface used to render to an offscreen pbuffer. |
88 class GL_EXPORT PbufferGLSurfaceGLX : public GLSurfaceGLX { | 91 class GL_EXPORT PbufferGLSurfaceGLX : public GLSurfaceGLX { |
(...skipping 16 matching lines...) Expand all Loading... |
105 gfx::Size size_; | 108 gfx::Size size_; |
106 void* config_; | 109 void* config_; |
107 XID pbuffer_; | 110 XID pbuffer_; |
108 | 111 |
109 DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceGLX); | 112 DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceGLX); |
110 }; | 113 }; |
111 | 114 |
112 } // namespace gfx | 115 } // namespace gfx |
113 | 116 |
114 #endif // UI_GL_GL_SURFACE_GLX_H_ | 117 #endif // UI_GL_GL_SURFACE_GLX_H_ |
OLD | NEW |