| 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 extern "C" { | 5 extern "C" { |
| 6 #include <X11/Xlib.h> | 6 #include <X11/Xlib.h> |
| 7 } | 7 } |
| 8 | 8 |
| 9 #include "ui/gfx/gl/gl_surface_glx.h" | 9 #include "ui/gfx/gl/gl_surface_glx.h" |
| 10 | 10 |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 | 96 |
| 97 // static | 97 // static |
| 98 bool GLSurfaceGLX::IsCreateContextRobustnessSupported() { | 98 bool GLSurfaceGLX::IsCreateContextRobustnessSupported() { |
| 99 return g_glx_create_context_robustness_supported; | 99 return g_glx_create_context_robustness_supported; |
| 100 } | 100 } |
| 101 | 101 |
| 102 void* GLSurfaceGLX::GetDisplay() { | 102 void* GLSurfaceGLX::GetDisplay() { |
| 103 return g_display; | 103 return g_display; |
| 104 } | 104 } |
| 105 | 105 |
| 106 NativeViewGLSurfaceGLX::NativeViewGLSurfaceGLX(gfx::PluginWindowHandle window) | 106 NativeViewGLSurfaceGLX::NativeViewGLSurfaceGLX(gfx::AcceleratedWidget window) |
| 107 : window_(window), | 107 : window_(window), |
| 108 config_(NULL) { | 108 config_(NULL) { |
| 109 } | 109 } |
| 110 | 110 |
| 111 NativeViewGLSurfaceGLX::NativeViewGLSurfaceGLX() | 111 NativeViewGLSurfaceGLX::NativeViewGLSurfaceGLX() |
| 112 : window_(0), | 112 : window_(0), |
| 113 config_(NULL) { | 113 config_(NULL) { |
| 114 } | 114 } |
| 115 | 115 |
| 116 NativeViewGLSurfaceGLX::~NativeViewGLSurfaceGLX() { | 116 NativeViewGLSurfaceGLX::~NativeViewGLSurfaceGLX() { |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 | 306 |
| 307 void* PbufferGLSurfaceGLX::GetHandle() { | 307 void* PbufferGLSurfaceGLX::GetHandle() { |
| 308 return reinterpret_cast<void*>(pbuffer_); | 308 return reinterpret_cast<void*>(pbuffer_); |
| 309 } | 309 } |
| 310 | 310 |
| 311 void* PbufferGLSurfaceGLX::GetConfig() { | 311 void* PbufferGLSurfaceGLX::GetConfig() { |
| 312 return config_; | 312 return config_; |
| 313 } | 313 } |
| 314 | 314 |
| 315 } // namespace gfx | 315 } // namespace gfx |
| OLD | NEW |