Revert 111040 - Reland 110355 - Use shared D3D9 texture to transport the compositor's backing buf...

content/common/gpu/image_transport_surface_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.
 
 #if defined(ENABLE_GPU)
 
 #include "content/common/gpu/image_transport_surface.h"
 
 // This conflicts with the defines in Xlib.h and must come first.
 #include "content/common/gpu/gpu_messages.h"
@@ skipping 59 matching lines @@
   virtual gfx::Size GetSize() OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
   virtual unsigned int GetBackingFrameBufferObject() OVERRIDE;
   virtual void SetVisible(bool visible) OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation
   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:
   virtual ~EGLImageTransportSurface() OVERRIDE;
   void ReleaseSurface(scoped_refptr<EGLAcceleratedSurface>* surface);
 
   uint32 fbo_id_;
 
   scoped_refptr<EGLAcceleratedSurface> back_surface_;
   scoped_refptr<EGLAcceleratedSurface> front_surface_;
@@ skipping 22 matching lines @@
   virtual bool SwapBuffers() OVERRIDE;
   virtual gfx::Size GetSize() OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
   virtual void SetVisible(bool visible) OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation:
   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:
   virtual ~GLXImageTransportSurface();
 
   // Tell the browser to release the surface.
   void ReleaseSurface();
 
   XID dummy_parent_;
   gfx::Size size_;
@@ skipping 28 matching lines @@
   virtual void Destroy() OVERRIDE;
   virtual bool IsOffscreen() OVERRIDE;
   virtual bool SwapBuffers() OVERRIDE;
   virtual gfx::Size GetSize() OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation:
   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:
   virtual ~OSMesaImageTransportSurface();
 
   // Tell the browser to release the surface.
   void ReleaseSurface();
 
   scoped_ptr<TransportDIB> shared_mem_;
   uint32 shared_id_;
@@ skipping 187 matching lines @@
 void EGLImageTransportSurface::OnNewSurfaceACK(
     uint64 surface_id, TransportDIB::Handle /*surface_handle*/) {
   DCHECK_EQ(back_surface_->pixmap(), surface_id);
   helper_->SetScheduled(true);
 }
 
 void EGLImageTransportSurface::OnBuffersSwappedACK() {
   helper_->SetScheduled(true);
 }
 
-
-void EGLImageTransportSurface::OnResizeViewACK() {
-  NOTREACHED();
-}
-
 GLXImageTransportSurface::GLXImageTransportSurface(
     GpuChannelManager* manager,
     int32 render_view_id,
     int32 renderer_id,
     int32 command_buffer_id)
       : gfx::NativeViewGLSurfaceGLX(),
         dummy_parent_(0),
         size_(1, 1),
         bound_(false),
         needs_resize_(false),
@@ skipping 145 matching lines @@
 }
 
 void GLXImageTransportSurface::OnNewSurfaceACK(
     uint64 surface_id, TransportDIB::Handle /*surface_handle*/) {
 }
 
 void GLXImageTransportSurface::OnBuffersSwappedACK() {
   helper_->SetScheduled(true);
 }
 
-void GLXImageTransportSurface::OnResizeViewACK() {
-  NOTREACHED();
-}
-
 OSMesaImageTransportSurface::OSMesaImageTransportSurface(
     GpuChannelManager* manager,
     int32 render_view_id,
     int32 renderer_id,
     int32 command_buffer_id)
   : gfx::GLSurfaceOSMesa(OSMESA_RGBA, gfx::Size(1, 1)),
     size_(gfx::Size(1, 1)) {
   helper_.reset(new ImageTransportHelper(this,
                                          manager,
                                          render_view_id,
@@ skipping 58 matching lines @@
 
 void OSMesaImageTransportSurface::OnNewSurfaceACK(
     uint64 surface_id, TransportDIB::Handle surface_handle) {
   shared_id_ = surface_id;
   shared_mem_.reset(TransportDIB::Map(surface_handle));
   DCHECK_NE(shared_mem_.get(), static_cast<void*>(NULL));
 
   helper_->SetScheduled(true);
 }
 
-void OSMesaImageTransportSurface::OnResizeViewACK() {
-  NOTREACHED();
-}
-
 bool OSMesaImageTransportSurface::SwapBuffers() {
   DCHECK_NE(shared_mem_.get(), static_cast<void*>(NULL));
 
   // Copy the OSMesa buffer to the shared memory
   glFinish();
   memcpy(shared_mem_->memory(), GetHandle(), size_.GetArea() * 4);
 
   GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
   params.surface_id = shared_id_;
   helper_->SendAcceleratedSurfaceBuffersSwapped(params);
@@ skipping 11 matching lines @@
 }
 
 }  // namespace
 
 // static
 scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateSurface(
     GpuChannelManager* manager,
     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,
                                              render_view_id,
                                              renderer_id,
                                              command_buffer_id);
       break;
     case gfx::kGLImplementationEGLGLES2:
       surface = new EGLImageTransportSurface(manager,
                                              render_view_id,
                                              renderer_id,
                                              command_buffer_id);
       break;
     case gfx::kGLImplementationOSMesaGL:
       surface = new OSMesaImageTransportSurface(manager,
                                                 render_view_id,
                                                 renderer_id,
                                                 command_buffer_id);
       break;
     default:
       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
     return NULL;
 }
 
 #endif  // defined(USE_GPU)