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

content/common/gpu/image_transport_surface_linux.cc

Index: content/common/gpu/image_transport_surface_linux.cc
===================================================================
--- content/common/gpu/image_transport_surface_linux.cc	(revision 110388)
+++ content/common/gpu/image_transport_surface_linux.cc	(working copy)
@@ -77,6 +77,7 @@
   virtual void OnNewSurfaceACK(
       uint64 surface_id, TransportDIB::Handle surface_handle) OVERRIDE;
   virtual void OnBuffersSwappedACK() OVERRIDE;
+  virtual void OnResizeViewACK() OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
  private:
@@ -118,6 +119,7 @@
   virtual void OnNewSurfaceACK(
       uint64 surface_id, TransportDIB::Handle surface_handle) OVERRIDE;
   virtual void OnBuffersSwappedACK() OVERRIDE;
+  virtual void OnResizeViewACK() OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
  private:
@@ -166,6 +168,7 @@
   virtual void OnNewSurfaceACK(
       uint64 surface_id, TransportDIB::Handle surface_handle) OVERRIDE;
   virtual void OnBuffersSwappedACK() OVERRIDE;
+  virtual void OnResizeViewACK() OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
  private:
@@ -373,6 +376,11 @@
   helper_->SetScheduled(true);
 }
 
+
+void EGLImageTransportSurface::OnResizeViewACK() {
+  NOTREACHED();
+}
+
 GLXImageTransportSurface::GLXImageTransportSurface(
     GpuChannelManager* manager,
     int32 render_view_id,
@@ -527,6 +535,10 @@
   helper_->SetScheduled(true);
 }
 
+void GLXImageTransportSurface::OnResizeViewACK() {
+  NOTREACHED();
+}
+
 OSMesaImageTransportSurface::OSMesaImageTransportSurface(
     GpuChannelManager* manager,
     int32 render_view_id,
@@ -605,6 +617,10 @@
   helper_->SetScheduled(true);
 }
 
+void OSMesaImageTransportSurface::OnResizeViewACK() {
+  NOTREACHED();
+}
+
 bool OSMesaImageTransportSurface::SwapBuffers() {
   DCHECK_NE(shared_mem_.get(), static_cast<void*>(NULL));
 
@@ -636,8 +652,9 @@
     int32 render_view_id,
     int32 renderer_id,
     int32 command_buffer_id,
-    gfx::PluginWindowHandle /* handle */) {
+    gfx::PluginWindowHandle handle) {
   scoped_refptr<gfx::GLSurface> surface;
+#if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   switch (gfx::GetGLImplementation()) {
     case gfx::kGLImplementationDesktopGL:
       surface = new GLXImageTransportSurface(manager,
@@ -661,6 +678,17 @@
       NOTREACHED();
       return NULL;
   }
+#else
+  surface = gfx::GLSurface::CreateViewGLSurface(false, handle);
+  if (!surface.get())
+    return NULL;
+
+  surface = new PassThroughImageTransportSurface(manager,
+                                                 render_view_id,
+                                                 renderer_id,
+                                                 command_buffer_id,
+                                                 surface.get());
+#endif
   if (surface->Initialize())
     return surface;
   else