Index: content/browser/gpu/browser_gpu_channel_host_factory.h |
diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.h b/content/browser/gpu/browser_gpu_channel_host_factory.h |
index a7c1b57059478fea9cb2634de32ad88028f66b39..d6f4de4582c8aad254d3e35be00138d25821d776 100644 |
--- a/content/browser/gpu/browser_gpu_channel_host_factory.h |
+++ b/content/browser/gpu/browser_gpu_channel_host_factory.h |
@@ -48,6 +48,11 @@ class CONTENT_EXPORT BrowserGpuChannelHostFactory |
unsigned internalformat, |
unsigned usage, |
const CreateGpuMemoryBufferCallback& callback) OVERRIDE; |
+ virtual gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferSync( |
+ const gfx::GpuMemoryBufferHandle& handle, |
+ const gfx::Size& size, |
+ unsigned internalformat, |
+ unsigned usage) OVERRIDE; |
virtual void DestroyGpuMemoryBuffer(const gfx::GpuMemoryBufferHandle& handle, |
int32 sync_point) OVERRIDE; |
@@ -72,6 +77,7 @@ class CONTENT_EXPORT BrowserGpuChannelHostFactory |
private: |
struct CreateRequest; |
+ class CreateGpuMemoryBufferRequest; |
class EstablishRequest; |
BrowserGpuChannelHostFactory(); |
@@ -87,13 +93,14 @@ class CONTENT_EXPORT BrowserGpuChannelHostFactory |
static void AddFilterOnIO(int gpu_host_id, |
scoped_refptr<IPC::MessageFilter> filter); |
- void CreateGpuMemoryBufferOnIO(const gfx::GpuMemoryBufferHandle& handle, |
- const gfx::Size& size, |
- unsigned internalformat, |
- unsigned usage, |
- uint32 request_id); |
+ void CreateGpuMemoryBufferOnIO( |
+ const gfx::GpuMemoryBufferHandle& handle, |
+ const gfx::Size& size, |
+ unsigned internalformat, |
+ unsigned usage, |
+ scoped_refptr<CreateGpuMemoryBufferRequest> request); |
void GpuMemoryBufferCreatedOnIO( |
- uint32 request_id, |
+ scoped_refptr<CreateGpuMemoryBufferRequest> request, |
const gfx::GpuMemoryBufferHandle& handle); |
void OnGpuMemoryBufferCreated( |
uint32 request_id, |