| 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 <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 | 88 |
| 89 // Child window, used to control resizes so that they're in-order with GL. | 89 // Child window, used to control resizes so that they're in-order with GL. |
| 90 gfx::AcceleratedWidget window_; | 90 gfx::AcceleratedWidget window_; |
| 91 | 91 |
| 92 // GLXDrawable for the window. | 92 // GLXDrawable for the window. |
| 93 GLXWindow glx_window_; | 93 GLXWindow glx_window_; |
| 94 | 94 |
| 95 GLXFBConfig config_; | 95 GLXFBConfig config_; |
| 96 gfx::Size size_; | 96 gfx::Size size_; |
| 97 | 97 |
| 98 scoped_ptr<VSyncProvider> vsync_provider_; | 98 std::unique_ptr<VSyncProvider> vsync_provider_; |
| 99 | 99 |
| 100 DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceGLX); | 100 DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceGLX); |
| 101 }; | 101 }; |
| 102 | 102 |
| 103 // A surface used to render to an offscreen pbuffer. | 103 // A surface used to render to an offscreen pbuffer. |
| 104 class GL_EXPORT UnmappedNativeViewGLSurfaceGLX : public GLSurfaceGLX { | 104 class GL_EXPORT UnmappedNativeViewGLSurfaceGLX : public GLSurfaceGLX { |
| 105 public: | 105 public: |
| 106 explicit UnmappedNativeViewGLSurfaceGLX(const gfx::Size& size); | 106 explicit UnmappedNativeViewGLSurfaceGLX(const gfx::Size& size); |
| 107 | 107 |
| 108 // Implement GLSurfaceGLX. | 108 // Implement GLSurfaceGLX. |
| (...skipping 16 matching lines...) Expand all Loading... |
| 125 | 125 |
| 126 // GLXDrawable for the window. | 126 // GLXDrawable for the window. |
| 127 GLXWindow glx_window_; | 127 GLXWindow glx_window_; |
| 128 | 128 |
| 129 DISALLOW_COPY_AND_ASSIGN(UnmappedNativeViewGLSurfaceGLX); | 129 DISALLOW_COPY_AND_ASSIGN(UnmappedNativeViewGLSurfaceGLX); |
| 130 }; | 130 }; |
| 131 | 131 |
| 132 } // namespace gfx | 132 } // namespace gfx |
| 133 | 133 |
| 134 #endif // UI_GL_GL_SURFACE_GLX_H_ | 134 #endif // UI_GL_GL_SURFACE_GLX_H_ |
| OLD | NEW |