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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 virtual void* GetHandle() OVERRIDE; | 62 virtual void* GetHandle() OVERRIDE; |
63 virtual std::string GetExtensions() OVERRIDE; | 63 virtual std::string GetExtensions() OVERRIDE; |
64 virtual void* GetConfig() OVERRIDE; | 64 virtual void* GetConfig() OVERRIDE; |
65 virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE; | 65 virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE; |
66 virtual VSyncProvider* GetVSyncProvider() OVERRIDE; | 66 virtual VSyncProvider* GetVSyncProvider() OVERRIDE; |
67 | 67 |
68 protected: | 68 protected: |
69 NativeViewGLSurfaceGLX(); | 69 NativeViewGLSurfaceGLX(); |
70 virtual ~NativeViewGLSurfaceGLX(); | 70 virtual ~NativeViewGLSurfaceGLX(); |
71 | 71 |
72 gfx::AcceleratedWidget window_; | 72 gfx::AcceleratedWidget parent_window_; |
| 73 gfx::AcceleratedWidget child_window_; |
73 | 74 |
74 private: | 75 private: |
75 void* config_; | 76 void* config_; |
76 gfx::Size size_; | 77 gfx::Size size_; |
77 | 78 |
78 scoped_ptr<VSyncProvider> vsync_provider_; | 79 scoped_ptr<VSyncProvider> vsync_provider_; |
79 | 80 |
80 DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceGLX); | 81 DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceGLX); |
81 }; | 82 }; |
82 | 83 |
(...skipping 18 matching lines...) Expand all Loading... |
101 gfx::Size size_; | 102 gfx::Size size_; |
102 void* config_; | 103 void* config_; |
103 XID pbuffer_; | 104 XID pbuffer_; |
104 | 105 |
105 DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceGLX); | 106 DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceGLX); |
106 }; | 107 }; |
107 | 108 |
108 } // namespace gfx | 109 } // namespace gfx |
109 | 110 |
110 #endif // UI_GL_GL_SURFACE_GLX_H_ | 111 #endif // UI_GL_GL_SURFACE_GLX_H_ |
OLD | NEW |