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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/accelerated_surface_container_linux.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/Xcomposite.h>
 
 #include "base/lazy_instance.h"
@@ skipping 151 matching lines @@
   DCHECK(instance);
   instance->MakeSharedContextCurrent();
 
   if (!AcceleratedSurfaceContainerLinuxGLX::InitializeOneOff())
     return false;
 
   // Create pixmap from window.
   // 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
   const int pixmapAttribs[] = {
     GLX_TEXTURE_TARGET_EXT, GLX_TEXTURE_2D_EXT,
     GLX_TEXTURE_FORMAT_EXT, GLX_TEXTURE_FORMAT_RGB_EXT,
     0
   };
 
   glx_pixmap_ = glXCreatePixmap(
       dpy, fbconfig_.Get(), pixmap_, pixmapAttribs);
 
   // Create texture.
   glGenTextures(1, &texture_id_);
   glBindTexture(GL_TEXTURE_2D, texture_id_);
   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
   return true;
 }
 
 AcceleratedSurfaceContainerLinuxGLX::~AcceleratedSurfaceContainerLinuxGLX() {
   ui::SharedResources* instance = ui::SharedResources::GetInstance();
   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_)
     XFreePixmap(dpy, pixmap_);
 }
 
 void AcceleratedSurfaceContainerLinuxGLX::Draw(
     const ui::TextureDrawParams& params,
     const gfx::Rect& clip_bounds_in_texture) {
   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);
   DrawInternal(*instance->program_no_swizzle(),
                params,
                clip_bounds_in_texture);
   glXReleaseTexImageEXT(dpy, glx_pixmap_, GLX_FRONT_LEFT_EXT);
 }
 
 // static
 bool AcceleratedSurfaceContainerLinuxGLX::InitializeOneOff()
 {
   static bool initialized = false;
   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;
     XCompositeQueryVersion(dpy, &major, &minor);
     if (major == 0 && minor < 2) {
       LOG(ERROR) << "Pixmap from window not supported.";
       return false;
     }
   }
 
@@ skipping 143 matching lines @@
   }
 }
 
 void AcceleratedSurfaceContainerLinux::SetCanvas(
     const SkCanvas& canvas,
     const gfx::Point& origin,
     const gfx::Size& overall_size) {
   NOTREACHED();
 }