Replacing GLSurface::SetVisibility with SetBufferAllocation for more explicit management.

content/common/gpu/image_transport_surface_linux.cc

 // Copyright (c) 2012 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/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"
 
 #include <map>
@@ skipping 75 matching lines @@
   // gfx::GLSurface implementation
   virtual bool Initialize() OVERRIDE;
   virtual void Destroy() OVERRIDE;
   virtual bool IsOffscreen() OVERRIDE;
   virtual bool SwapBuffers() OVERRIDE;
   virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
   virtual std::string GetExtensions() OVERRIDE;
   virtual gfx::Size GetSize() OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
   virtual unsigned int GetBackingFrameBufferObject() OVERRIDE;
-  virtual void SetVisibility(VisibilityState visibility_state) OVERRIDE;
+  virtual void SetBufferAllocation(BufferAllocationState state) OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation
   virtual void OnNewSurfaceACK(
       uint64 surface_handle, TransportDIB::Handle shm_handle) OVERRIDE;
   virtual void OnBuffersSwappedACK() OVERRIDE;
   virtual void OnPostSubBufferACK() OVERRIDE;
   virtual void OnResizeViewACK() OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
  private:
   virtual ~EGLImageTransportSurface() OVERRIDE;
   void ReleaseSurface(scoped_refptr<EGLAcceleratedSurface>* surface);
   void SendBuffersSwapped();
   void SendPostSubBuffer(int x, int y, int width, int height);
 
-  // Tracks the current surface visibility state.
-  VisibilityState visibility_state_;
+  // Tracks the current buffer allocation state.
+  BufferAllocationState buffer_allocation_state_;
 
   uint32 fbo_id_;
 
   scoped_refptr<EGLAcceleratedSurface> back_surface_;
   scoped_refptr<EGLAcceleratedSurface> front_surface_;
   gfx::Rect previous_damage_rect_;
 
   // Whether or not we've successfully made the surface current once.
   bool made_current_;
 
@@ skipping 13 matching lines @@
                            GpuCommandBufferStub* stub);
 
   // gfx::GLSurface implementation:
   virtual bool Initialize() OVERRIDE;
   virtual void Destroy() OVERRIDE;
   virtual bool SwapBuffers() OVERRIDE;
   virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
   virtual std::string GetExtensions();
   virtual gfx::Size GetSize() OVERRIDE;
   virtual bool OnMakeCurrent(gfx::GLContext* context) OVERRIDE;
-  virtual void SetVisibility(VisibilityState visibility_state) OVERRIDE;
+  virtual void SetBufferAllocation(BufferAllocationState state) OVERRIDE;
 
  protected:
   // ImageTransportSurface implementation:
   virtual void OnNewSurfaceACK(
       uint64 surface_handle, TransportDIB::Handle shm_handle) OVERRIDE;
   virtual void OnBuffersSwappedACK() OVERRIDE;
   virtual void OnPostSubBufferACK() OVERRIDE;
   virtual void OnResizeViewACK() OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
  private:
   virtual ~GLXImageTransportSurface();
 
   // Tell the browser to release the surface.
   void ReleaseSurface();
 
   void SendBuffersSwapped();
   void SendPostSubBuffer(int x, int y, int width, int height);
 
   void ResizeSurface(gfx::Size size);
 
-  // Tracks the current surface visibility state.
-  VisibilityState visibility_state_;
+  // Tracks the current buffer allocation state.
+  BufferAllocationState buffer_allocation_state_;
 
   XID dummy_parent_;
   gfx::Size size_;
 
   // Whether or not the image has been bound on the browser side.
   bool bound_;
 
   // Whether or not we need to send a resize on the next swap.
   bool needs_resize_;
 
@@ skipping 81 matching lines @@
 EGLAcceleratedSurface::~EGLAcceleratedSurface() {
   glDeleteTextures(1, &texture_);
   eglDestroyImageKHR(gfx::GLSurfaceEGL::GetHardwareDisplay(), image_);
   XFreePixmap(gfx::GLSurfaceEGL::GetNativeDisplay(), pixmap_);
 }
 
 EGLImageTransportSurface::EGLImageTransportSurface(
     GpuChannelManager* manager,
     GpuCommandBufferStub* stub)
     : gfx::PbufferGLSurfaceEGL(false, gfx::Size(1, 1)),
-      visibility_state_(VISIBILITY_STATE_FOREGROUND),
+      buffer_allocation_state_(BUFFER_ALLOCATION_FRONT_AND_BACK),
       fbo_id_(0),
       made_current_(false) {
   helper_.reset(new ImageTransportHelper(this,
                                          manager,
                                          stub,
                                          gfx::kNullPluginWindow));
 }
 
 EGLImageTransportSurface::~EGLImageTransportSurface() {
   Destroy();
@@ skipping 42 matching lines @@
   }
 
   made_current_ = true;
   return true;
 }
 
 unsigned int EGLImageTransportSurface::GetBackingFrameBufferObject() {
   return fbo_id_;
 }
 
-void EGLImageTransportSurface::SetVisibility(VisibilityState visibility_state) {
-  if (visibility_state_ == visibility_state)
+void EGLImageTransportSurface::SetBufferAllocation(
+    BufferAllocationState state) {
+  if (buffer_allocation_state_ == state)
     return;
-  visibility_state_ = visibility_state;
+  buffer_allocation_state_ = state;
 
-  switch (visibility_state) {
-    case VISIBILITY_STATE_FOREGROUND:
+  switch (state) {
+    case BUFFER_ALLOCATION_FRONT_AND_BACK:
       if (!back_surface_.get() && front_surface_.get())
         OnResize(front_surface_->size());
       break;
 
-    case VISIBILITY_STATE_BACKGROUND:
+    case BUFFER_ALLOCATION_FRONT_ONLY:
       if (back_surface_.get() && front_surface_.get())
         ReleaseSurface(&back_surface_);
       break;
 
-    case VISIBILITY_STATE_HIBERNATED:
+    case BUFFER_ALLOCATION_NONE:
       if (back_surface_.get() && front_surface_.get())
         ReleaseSurface(&back_surface_);
       break;
 
     default:
       NOTREACHED();
   }
 }
 
 void EGLImageTransportSurface::ReleaseSurface(
@@ skipping 148 matching lines @@
 }
 
 void EGLImageTransportSurface::OnResizeViewACK() {
   NOTREACHED();
 }
 
 GLXImageTransportSurface::GLXImageTransportSurface(
     GpuChannelManager* manager,
     GpuCommandBufferStub* stub)
     : gfx::NativeViewGLSurfaceGLX(),
-      visibility_state_(VISIBILITY_STATE_FOREGROUND),
+      buffer_allocation_state_(BUFFER_ALLOCATION_FRONT_AND_BACK),
       dummy_parent_(0),
       size_(1, 1),
       bound_(false),
       needs_resize_(false),
       made_current_(false) {
   helper_.reset(new ImageTransportHelper(this,
                                          manager,
                                          stub,
                                          gfx::kNullPluginWindow));
 }
@@ skipping 63 matching lines @@
 }
 
 void GLXImageTransportSurface::ReleaseSurface() {
   DCHECK(bound_);
   GpuHostMsg_AcceleratedSurfaceRelease_Params params;
   params.identifier = window_;
   helper_->SendAcceleratedSurfaceRelease(params);
   bound_ = false;
 }
 
-void GLXImageTransportSurface::SetVisibility(VisibilityState visibility_state) {
-  if (visibility_state_ == visibility_state)
+void GLXImageTransportSurface::SetBufferAllocation(
+    BufferAllocationState state) {
+  if (buffer_allocation_state_ == state)
     return;
-  visibility_state_ = visibility_state;
+  buffer_allocation_state_ = state;
 
-  switch (visibility_state) {
-    case VISIBILITY_STATE_FOREGROUND: {
+  switch (state) {
+    case BUFFER_ALLOCATION_FRONT_AND_BACK: {
       ResizeSurface(size_);
       break;
     }
-    case VISIBILITY_STATE_BACKGROUND: {
+    case BUFFER_ALLOCATION_FRONT_ONLY: {
       ResizeSurface(gfx::Size(1,1));
       break;
     }
-    case VISIBILITY_STATE_HIBERNATED: {
+    case BUFFER_ALLOCATION_NONE: {
       ResizeSurface(gfx::Size(1,1));
       if (bound_)
         ReleaseSurface();
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
@@ skipping 299 matching lines @@
                                                    stub,
                                                    surface.get(),
                                                    handle.transport);
   }
 
   if (surface->Initialize())
     return surface;
   else
     return NULL;
 }