Remove call to glXCreateWindow

It turns out that this call won't fix the NVIDIA out of memory
because of driver bugs, and it turns out that this is causing
desktop Aura to not render correctly.

BUG=


Review URL: https://chromiumcodereview.appspot.com/11543026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172716 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 18 deletions

diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc
index 81d5ec3..4379dc0 100644
--- a/ui/gl/gl_surface_glx.cc
+++ b/ui/gl/gl_surface_glx.cc
@@ -459,24 +459,10 @@ bool NativeViewGLSurfaceGLX::Initialize() {
   else if (g_glx_sgi_video_sync_supported)
     vsync_provider_.reset(new SGIVideoSyncVSyncProvider(window_));
 
-  glx_window_ = glXCreateWindow(
-      g_display,
-      static_cast<GLXFBConfig>(GetConfig()),
-      window_,
-      NULL);
-  if (!glx_window_) {
-    LOG(ERROR) << "glXCreateWindow failed for window " << window_ << ".";
-    return false;
-  }
-
   return true;
 }
 
 void NativeViewGLSurfaceGLX::Destroy() {
-  if (glx_window_) {
-    glXDestroyWindow(g_display, glx_window_);
-    glx_window_ = 0;
-  }
 }
 
 bool NativeViewGLSurfaceGLX::Resize(const gfx::Size& size) {
@@ -494,7 +480,7 @@ bool NativeViewGLSurfaceGLX::IsOffscreen() {
 }
 
 bool NativeViewGLSurfaceGLX::SwapBuffers() {
-  glXSwapBuffers(g_display, glx_window_);
+  glXSwapBuffers(g_display, window_);
   // For latency_tests.cc:
   UNSHIPPED_TRACE_EVENT_INSTANT0("test_gpu", "CompositorSwapBuffersComplete");
   return true;
@@ -505,7 +491,7 @@ gfx::Size NativeViewGLSurfaceGLX::GetSize() {
 }
 
 void* NativeViewGLSurfaceGLX::GetHandle() {
-  return reinterpret_cast<void*>(glx_window_);
+  return reinterpret_cast<void*>(window_);
 }
 
 std::string NativeViewGLSurfaceGLX::GetExtensions() {
@@ -581,7 +567,7 @@ void* NativeViewGLSurfaceGLX::GetConfig() {
 bool NativeViewGLSurfaceGLX::PostSubBuffer(
     int x, int y, int width, int height) {
   DCHECK(gfx::g_driver_glx.ext.b_GLX_MESA_copy_sub_buffer);
-  glXCopySubBufferMESA(g_display, glx_window_, x, y, width, height);
+  glXCopySubBufferMESA(g_display, window_, x, y, width, height);
   return true;
 }
 
diff --git a/ui/gl/gl_surface_glx.h b/ui/gl/gl_surface_glx.h
index ea5a2a2..132821e 100644
--- a/ui/gl/gl_surface_glx.h
+++ b/ui/gl/gl_surface_glx.h
@@ -77,7 +77,6 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX {
   virtual ~NativeViewGLSurfaceGLX();
 
   gfx::AcceleratedWidget window_;
-  XID glx_window_;
 
  private:
   void* config_;