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

content/common/gpu/image_transport_surface_mac.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"
 
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 25 matching lines @@
   virtual bool SwapBuffers() OVERRIDE;
   virtual gfx::Size GetSize() OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
   virtual unsigned int GetBackingFrameBufferObject() OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation
   virtual void OnNewSurfaceACK(uint64 surface_id,
                                TransportDIB::Handle shm_handle) OVERRIDE;
   virtual void OnBuffersSwappedACK() OVERRIDE;
-  virtual void OnResizeViewACK() OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
  private:
   virtual ~IOSurfaceImageTransportSurface() OVERRIDE;
 
   uint32 fbo_id_;
   GLuint texture_id_;
 
   base::mac::ScopedCFTypeRef<CFTypeRef> io_surface_;
 
@@ skipping 31 matching lines @@
   virtual bool SwapBuffers() OVERRIDE;
   virtual gfx::Size GetSize() OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
   virtual unsigned int GetBackingFrameBufferObject() OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation
   virtual void OnBuffersSwappedACK() OVERRIDE;
   virtual void OnNewSurfaceACK(uint64 surface_id,
                                TransportDIB::Handle shm_handle) OVERRIDE;
-  virtual void OnResizeViewACK() OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
  private:
   virtual ~TransportDIBImageTransportSurface() OVERRIDE;
 
   uint32 fbo_id_;
   GLuint render_buffer_id_;
 
   scoped_ptr<TransportDIB> shared_mem_;
 
@@ skipping 125 matching lines @@
   helper_->SetScheduled(true);
 }
 
 void IOSurfaceImageTransportSurface::OnNewSurfaceACK(
     uint64 surface_id,
     TransportDIB::Handle /* shm_handle */) {
   DCHECK_EQ(io_surface_id_, surface_id);
   helper_->SetScheduled(true);
 }
 
-void IOSurfaceImageTransportSurface::OnResizeViewACK() {
-  NOTREACHED();
-}
-
 void IOSurfaceImageTransportSurface::OnResize(gfx::Size size) {
   IOSurfaceSupport* io_surface_support = IOSurfaceSupport::Initialize();
 
   // Caching |context_| from OnMakeCurrent. It should still be current.
   DCHECK(context_->IsCurrent(this));
 
   size_ = size;
 
   if (texture_id_) {
     glDeleteTextures(1, &texture_id_);
@@ skipping 184 matching lines @@
 
 void TransportDIBImageTransportSurface::OnNewSurfaceACK(
     uint64 surface_id,
     TransportDIB::Handle shm_handle) {
   helper_->SetScheduled(true);
 
   shared_mem_.reset(TransportDIB::Map(shm_handle));
   DCHECK_NE(shared_mem_.get(), static_cast<void*>(NULL));
 }
 
-void TransportDIBImageTransportSurface::OnResizeViewACK() {
-  NOTREACHED();
-}
-
 void TransportDIBImageTransportSurface::OnResize(gfx::Size size) {
   size_ = size;
 
   if (!render_buffer_id_)
     glGenRenderbuffersEXT(1, &render_buffer_id_);
 
   GLint previous_fbo_id = 0;
   glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, &previous_fbo_id);
 
   GLint previous_renderbuffer_id = 0;
@@ skipping 55 matching lines @@
       NOTREACHED();
       return NULL;
   }
   if (surface->Initialize())
     return surface;
   else
     return NULL;
 }
 
 #endif  // defined(USE_GPU)