summaryrefslogtreecommitdiffstats
path: root/ui/gl/gl_surface_glx.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-18 18:00:22 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-18 18:00:22 +0000
commit4e0f45f5cc4911b529040c82058b255049426e93 (patch)
tree6535c84613ab4f672f08b27d2b2d36cffa4bce92 /ui/gl/gl_surface_glx.cc
parentf7d2580cf40718cb427f8587e9f1f6f6f837ba39 (diff)
downloadchromium_src-4e0f45f5cc4911b529040c82058b255049426e93.zip
chromium_src-4e0f45f5cc4911b529040c82058b255049426e93.tar.gz
chromium_src-4e0f45f5cc4911b529040c82058b255049426e93.tar.bz2
RefCounted types should not have public destructors, Linux fixes
BUG=123295 TEST=none Review URL: https://chromiumcodereview.appspot.com/10392152 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137893 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl/gl_surface_glx.cc')
-rw-r--r--ui/gl/gl_surface_glx.cc34
1 files changed, 16 insertions, 18 deletions
diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc
index ba8ce92..a5609cd 100644
--- a/ui/gl/gl_surface_glx.cc
+++ b/ui/gl/gl_surface_glx.cc
@@ -38,11 +38,7 @@ bool g_glx_create_context_robustness_supported = false;
} // namespace anonymous
-GLSurfaceGLX::GLSurfaceGLX() {
-}
-
-GLSurfaceGLX::~GLSurfaceGLX() {
-}
+GLSurfaceGLX::GLSurfaceGLX() {}
bool GLSurfaceGLX::InitializeOneOff() {
static bool initialized = false;
@@ -103,20 +99,13 @@ void* GLSurfaceGLX::GetDisplay() {
return g_display;
}
+GLSurfaceGLX::~GLSurfaceGLX() {}
+
NativeViewGLSurfaceGLX::NativeViewGLSurfaceGLX(gfx::AcceleratedWidget window)
: window_(window),
config_(NULL) {
}
-NativeViewGLSurfaceGLX::NativeViewGLSurfaceGLX()
- : window_(0),
- config_(NULL) {
-}
-
-NativeViewGLSurfaceGLX::~NativeViewGLSurfaceGLX() {
- Destroy();
-}
-
bool NativeViewGLSurfaceGLX::Initialize() {
XWindowAttributes attributes;
if (!XGetWindowAttributes(g_display, window_, &attributes)) {
@@ -234,16 +223,21 @@ bool NativeViewGLSurfaceGLX::PostSubBuffer(
return true;
}
+NativeViewGLSurfaceGLX::NativeViewGLSurfaceGLX()
+ : window_(0),
+ config_(NULL) {
+}
+
+NativeViewGLSurfaceGLX::~NativeViewGLSurfaceGLX() {
+ Destroy();
+}
+
PbufferGLSurfaceGLX::PbufferGLSurfaceGLX(const gfx::Size& size)
: size_(size),
config_(NULL),
pbuffer_(0) {
}
-PbufferGLSurfaceGLX::~PbufferGLSurfaceGLX() {
- Destroy();
-}
-
bool PbufferGLSurfaceGLX::Initialize() {
DCHECK(!pbuffer_);
@@ -323,4 +317,8 @@ void* PbufferGLSurfaceGLX::GetConfig() {
return config_;
}
+PbufferGLSurfaceGLX::~PbufferGLSurfaceGLX() {
+ Destroy();
+}
+
} // namespace gfx