Reland 110355 - Use shared D3D9 texture to transport the compositor's backing buffer to the brows...

content/browser/renderer_host/accelerated_surface_container_linux.cc

Index: content/browser/renderer_host/accelerated_surface_container_linux.cc
===================================================================
--- content/browser/renderer_host/accelerated_surface_container_linux.cc	(revision 106933)
+++ content/browser/renderer_host/accelerated_surface_container_linux.cc	(working copy)
@@ -169,7 +169,7 @@
   // We receive a window here rather than a pixmap directly because drivers
   // require (or required) that the pixmap used to create the GL texture be
   // created in the same process as the texture.
-  Display* dpy = gfx::GLSurfaceGLX::GetDisplay();
+  Display* dpy = static_cast<Display*>(instance->GetDisplay());
   pixmap_ = XCompositeNameWindowPixmap(dpy, *surface_id);
 
   // Wrap the pixmap in a GLXPixmap
@@ -198,7 +198,7 @@
   DCHECK(instance);
   instance->MakeSharedContextCurrent();
 
-  Display* dpy = gfx::GLSurfaceGLX::GetDisplay();
+  Display* dpy = static_cast<Display*>(instance->GetDisplay());
   if (glx_pixmap_)
     glXDestroyGLXPixmap(dpy, glx_pixmap_);
   if (pixmap_)
@@ -211,7 +211,7 @@
   ui::SharedResources* instance = ui::SharedResources::GetInstance();
   DCHECK(instance);
 
-  Display* dpy = gfx::GLSurfaceGLX::GetDisplay();
+  Display* dpy = static_cast<Display*>(instance->GetDisplay());
 
   glBindTexture(GL_TEXTURE_2D, texture_id_);
   glXBindTexImageEXT(dpy, glx_pixmap_, GLX_FRONT_LEFT_EXT, NULL);
@@ -228,7 +228,10 @@
   if (initialized)
     return true;
 
-  Display* dpy = gfx::GLSurfaceGLX::GetDisplay();
+  ui::SharedResources* instance = ui::SharedResources::GetInstance();
+  DCHECK(instance);
+
+  Display* dpy = static_cast<Display*>(instance->GetDisplay());
   int event_base, error_base;
   if (XCompositeQueryExtension(dpy, &event_base, &error_base)) {
     int major = 0, minor = 2;