Decoupling backbuffer allocation suggestion from frontbuffer allocation suggestion.

content/common/gpu/image_transport_surface_linux.cc

Index: content/common/gpu/image_transport_surface_linux.cc
diff --git a/content/common/gpu/image_transport_surface_linux.cc b/content/common/gpu/image_transport_surface_linux.cc
index 90341b5b0c25d83a8289dd37413aaaf76fbf8f53..fec95351266c9cd45fdf101daacd9999b3c51632 100644
--- a/content/common/gpu/image_transport_surface_linux.cc
+++ b/content/common/gpu/image_transport_surface_linux.cc
@@ -93,7 +93,8 @@ class EGLImageTransportSurface
   virtual gfx::Size GetSize() OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
   virtual unsigned int GetBackingFrameBufferObject() OVERRIDE;
-  virtual void SetBufferAllocation(BufferAllocationState state) OVERRIDE;
+  virtual void SetBackbufferAllocation(bool allocated) OVERRIDE;
+  virtual void SetFrontbufferAllocation(bool allocated) OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation
@@ -109,9 +110,14 @@ class EGLImageTransportSurface
   void ReleaseSurface(scoped_refptr<EGLAcceleratedSurface>* surface);
   void SendBuffersSwapped();
   void SendPostSubBuffer(int x, int y, int width, int height);
+  void AdjustBufferAllocations();
 
   // Tracks the current buffer allocation state.
-  BufferAllocationState buffer_allocation_state_;
+  bool backbuffer_suggested_allocation_;
+  bool frontbuffer_suggested_allocation_;
+
+  // The expected size when visible.
+  gfx::Size visible_size_;
 
   uint32 fbo_id_;
 
@@ -145,7 +151,8 @@ class GLXImageTransportSurface
   virtual std::string GetExtensions();
   virtual gfx::Size GetSize() OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
-  virtual void SetBufferAllocation(BufferAllocationState state) OVERRIDE;
+  virtual void SetBackbufferAllocation(bool allocated) OVERRIDE;
+  virtual void SetFrontbufferAllocation(bool allocated) OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation:
@@ -166,9 +173,11 @@ class GLXImageTransportSurface
   void SendPostSubBuffer(int x, int y, int width, int height);
 
   void ResizeSurface(gfx::Size size);
+  void AdjustBufferAllocations();
 
   // Tracks the current buffer allocation state.
-  BufferAllocationState buffer_allocation_state_;
+  bool backbuffer_suggested_allocation_;
+  bool frontbuffer_suggested_allocation_;
 
   XID dummy_parent_;
   gfx::Size size_;
@@ -270,7 +279,8 @@ EGLImageTransportSurface::EGLImageTransportSurface(
     GpuChannelManager* manager,
     GpuCommandBufferStub* stub)
     : gfx::PbufferGLSurfaceEGL(false, gfx::Size(16, 16)),
-      buffer_allocation_state_(BUFFER_ALLOCATION_FRONT_AND_BACK),
+      backbuffer_suggested_allocation_(true),
+      frontbuffer_suggested_allocation_(true),
       fbo_id_(0),
       made_current_(false) {
   helper_.reset(new ImageTransportHelper(this,
@@ -336,30 +346,25 @@ unsigned int EGLImageTransportSurface::GetBackingFrameBufferObject() {
   return fbo_id_;
 }
 
-void EGLImageTransportSurface::SetBufferAllocation(
-    BufferAllocationState state) {
-  if (buffer_allocation_state_ == state)
+void EGLImageTransportSurface::SetBackbufferAllocation(bool allocated) {
+  if (backbuffer_suggested_allocation_ == allocated)
     return;
-  buffer_allocation_state_ = state;
-
-  switch (state) {
-    case BUFFER_ALLOCATION_FRONT_AND_BACK:
-      if (!back_surface_.get() && front_surface_.get())
-        OnResize(front_surface_->size());
-      break;
-
-    case BUFFER_ALLOCATION_FRONT_ONLY:
-      if (back_surface_.get() && front_surface_.get())
-        ReleaseSurface(&back_surface_);
-      break;
+  backbuffer_suggested_allocation_ = allocated;
+  AdjustBufferAllocations();
+}
 
-    case BUFFER_ALLOCATION_NONE:
-      if (back_surface_.get() && front_surface_.get())
-        ReleaseSurface(&back_surface_);
-      break;
+void EGLImageTransportSurface::SetFrontbufferAllocation(bool allocated) {
+  if (frontbuffer_suggested_allocation_ == allocated)
+    return;
+  frontbuffer_suggested_allocation_ = allocated;
+}
 
-    default:
-      NOTREACHED();
+void EGLImageTransportSurface::AdjustBufferAllocations() {
+  if (!!back_surface_.get() != backbuffer_suggested_allocation_) {
+    if (backbuffer_suggested_allocation_)
+      OnResize(visible_size_);
+    else
+      ReleaseSurface(&back_surface_);
   }
 }
 
@@ -374,6 +379,7 @@ void EGLImageTransportSurface::ReleaseSurface(
 }
 
 void EGLImageTransportSurface::OnResize(gfx::Size size) {
+  visible_size_ = size;
   back_surface_ = new EGLAcceleratedSurface(size);
 
   GLint previous_fbo_id = 0;
@@ -399,6 +405,8 @@ void EGLImageTransportSurface::OnResize(gfx::Size size) {
 }
 
 bool EGLImageTransportSurface::SwapBuffers() {
+  DCHECK(backbuffer_suggested_allocation_);
+  DCHECK(frontbuffer_suggested_allocation_);
   front_surface_.swap(back_surface_);
   DCHECK_NE(front_surface_.get(), static_cast<EGLAcceleratedSurface*>(NULL));
   helper_->DeferToFence(base::Bind(
@@ -428,7 +436,8 @@ void EGLImageTransportSurface::SendBuffersSwapped() {
 
 bool EGLImageTransportSurface::PostSubBuffer(
     int x, int y, int width, int height) {
-
+  DCHECK(backbuffer_suggested_allocation_);
+  DCHECK(frontbuffer_suggested_allocation_);
   DCHECK_NE(back_surface_.get(), static_cast<EGLAcceleratedSurface*>(NULL));
   gfx::Size expected_size = back_surface_->size();
   bool surfaces_same_size = front_surface_.get() &&
@@ -527,7 +536,8 @@ GLXImageTransportSurface::GLXImageTransportSurface(
     GpuChannelManager* manager,
     GpuCommandBufferStub* stub)
     : gfx::NativeViewGLSurfaceGLX(),
-      buffer_allocation_state_(BUFFER_ALLOCATION_FRONT_AND_BACK),
+      backbuffer_suggested_allocation_(true),
+      frontbuffer_suggested_allocation_(true),
       dummy_parent_(0),
       size_(1, 1),
       bound_(false),
@@ -611,29 +621,27 @@ void GLXImageTransportSurface::ReleaseSurface() {
   bound_ = false;
 }
 
-void GLXImageTransportSurface::SetBufferAllocation(
-    BufferAllocationState state) {
-  if (buffer_allocation_state_ == state)
+void GLXImageTransportSurface::SetBackbufferAllocation(bool allocated) {
+  if (backbuffer_suggested_allocation_ == allocated)
     return;
-  buffer_allocation_state_ = state;
+  backbuffer_suggested_allocation_ = allocated;
+  AdjustBufferAllocations();

[jonathan.backer, 2012/05/10 21:37:48]

I think that we can just Resize here (the window is out backbuffer).

+}
 
-  switch (state) {
-    case BUFFER_ALLOCATION_FRONT_AND_BACK: {
-      ResizeSurface(size_);
-      break;
-    }
-    case BUFFER_ALLOCATION_FRONT_ONLY: {
-      ResizeSurface(gfx::Size(1,1));
-      break;
-    }
-    case BUFFER_ALLOCATION_NONE: {
-      ResizeSurface(gfx::Size(1,1));
-      if (bound_)
-        ReleaseSurface();
-      break;
-    }
-    default:
-      NOTREACHED();
+void GLXImageTransportSurface::SetFrontbufferAllocation(bool allocated) {
+  if (frontbuffer_suggested_allocation_ == allocated)
+    return;
+  frontbuffer_suggested_allocation_ = allocated;

[jonathan.backer, 2012/05/10 21:37:48]

I think that we can just ReleaseSurface here when allocated == false and bound_
== true. The frontbuffer is created (in reponse to SwapBuffers) and destroyed in
the browser.

+  AdjustBufferAllocations();
+}
+
+void GLXImageTransportSurface::AdjustBufferAllocations() {
+  if (backbuffer_suggested_allocation_) {

[jonathan.backer, 2012/05/10 21:37:48]

We wouldn't need this.

+    ResizeSurface(size_);
+  } else {
+    ResizeSurface(gfx::Size(1,1));
+    if (!frontbuffer_suggested_allocation_ && bound_)
+      ReleaseSurface();
   }
 }
 
@@ -656,6 +664,8 @@ void GLXImageTransportSurface::OnResize(gfx::Size size) {
 }
 
 bool GLXImageTransportSurface::SwapBuffers() {
+  DCHECK(backbuffer_suggested_allocation_);
+  DCHECK(frontbuffer_suggested_allocation_);
   gfx::NativeViewGLSurfaceGLX::SwapBuffers();
   helper_->DeferToFence(base::Bind(
       &GLXImageTransportSurface::SendBuffersSwapped,
@@ -682,6 +692,8 @@ void GLXImageTransportSurface::SendBuffersSwapped() {
 
 bool GLXImageTransportSurface::PostSubBuffer(
     int x, int y, int width, int height) {
+  DCHECK(backbuffer_suggested_allocation_);
+  DCHECK(frontbuffer_suggested_allocation_);
   gfx::NativeViewGLSurfaceGLX::PostSubBuffer(x, y, width, height);
   helper_->DeferToFence(base::Bind(
       &GLXImageTransportSurface::SendPostSubBuffer,