| 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 a442d160e65c135a4439e6655450ec141852a31e..f514b63efa425dd7d5f919f19373800923c3a8ec 100644
|
| --- a/content/browser/gpu/browser_gpu_channel_host_factory.h
|
| +++ b/content/browser/gpu/browser_gpu_channel_host_factory.h
|
| @@ -34,10 +34,12 @@ class CONTENT_EXPORT BrowserGpuChannelHostFactory
|
| const GPUCreateCommandBufferConfig& init_params,
|
| int32 route_id) OVERRIDE;
|
| virtual void CreateImage(
|
| - gfx::PluginWindowHandle window,
|
| + const gfx::GpuMemoryBufferHandle& handle,
|
| + const gfx::Size& size,
|
| + unsigned internalformat,
|
| int32 image_id,
|
| const CreateImageCallback& callback) OVERRIDE;
|
| - virtual void DeleteImage(int32 image_idu, int32 sync_point) OVERRIDE;
|
| + virtual void DeleteImage(int32 image_id, int32 sync_point) OVERRIDE;
|
| virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
|
| size_t width,
|
| size_t height,
|
| @@ -87,13 +89,15 @@ class CONTENT_EXPORT BrowserGpuChannelHostFactory
|
| const GPUCreateCommandBufferConfig& init_params);
|
| static void CommandBufferCreatedOnIO(CreateRequest* request, bool succeeded);
|
| void CreateImageOnIO(
|
| - gfx::PluginWindowHandle window,
|
| + const gfx::GpuMemoryBufferHandle& handle,
|
| + const gfx::Size& size,
|
| + unsigned internalformat,
|
| int32 image_id,
|
| const CreateImageCallback& callback);
|
| static void ImageCreatedOnIO(
|
| - const CreateImageCallback& callback, const gfx::Size size);
|
| + const CreateImageCallback& callback, bool succeeded);
|
| static void OnImageCreated(
|
| - const CreateImageCallback& callback, const gfx::Size size);
|
| + const CreateImageCallback& callback, bool succeeded);
|
| void DeleteImageOnIO(int32 image_id, int32 sync_point);
|
| static void AddFilterOnIO(int gpu_host_id,
|
| scoped_refptr<IPC::MessageFilter> filter);
|
|
|