Index: content/common/gpu/texture_image_transport_surface.h |
diff --git a/content/common/gpu/texture_image_transport_surface.h b/content/common/gpu/texture_image_transport_surface.h |
index 4d77725ce87de4dc4f301a03f3700b3197564791..d0632dcc74530ade31e7f15f4c058bcaac6e5893 100644 |
--- a/content/common/gpu/texture_image_transport_surface.h |
+++ b/content/common/gpu/texture_image_transport_surface.h |
@@ -35,7 +35,8 @@ class TextureImageTransportSurface : |
virtual unsigned int GetBackingFrameBufferObject() OVERRIDE; |
virtual bool PostSubBuffer(int x, int y, int width, int height) 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; |
virtual void* GetShareHandle() OVERRIDE; |
virtual void* GetDisplay() OVERRIDE; |
virtual void* GetConfig() OVERRIDE; |
@@ -47,6 +48,7 @@ class TextureImageTransportSurface : |
virtual void OnBuffersSwappedACK() OVERRIDE; |
virtual void OnPostSubBufferACK() OVERRIDE; |
virtual void OnResizeViewACK() OVERRIDE; |
+ virtual void OnDiscardSurface(uint64 surface_id) OVERRIDE; |
virtual void OnResize(gfx::Size size) OVERRIDE; |
// GpuCommandBufferStub::DestructionObserver implementation. |
@@ -66,16 +68,20 @@ class TextureImageTransportSurface : |
// Whether or not that texture has been sent to the client yet. |
bool sent_to_client; |
+ bool allocated; |
+ bool suggested_allocation; |
piman
2012/05/04 00:03:49
I don't think suggested_allocation belongs here. O
mmocny
2012/05/04 18:55:52
Suggested allocation has evolved with this patch a
|
// The texture info in the parent stub. |
gpu::gles2::TextureManager::TextureInfo::Ref info; |
}; |
virtual ~TextureImageTransportSurface(); |
- void CreateBackTexture(const gfx::Size& size); |
- void ReleaseBackTexture(); |
- void AttachBackTextureToFBO(); |
+ void CreateTexture(int id, const gfx::Size& size); |
+ void RequestReleaseTexture(int id); |
+ void ReleaseTexture(int id); |
+ void AttachTextureToFBO(int id); |
void ReleaseParentStub(); |
+ int front() const { return front_; } |
int back() const { return 1 - front_; } |
// The framebuffer that represents this surface (service id). Allocated lazily |