| Index: content/common/gpu/gpu_messages.h
|
| diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h
|
| index c60cfad78b09d57a4ec22ff5501bac55f2c66011..0be5fe5ee21c58243391d3c8b5cb3200dc9a9a6e 100644
|
| --- a/content/common/gpu/gpu_messages.h
|
| +++ b/content/common/gpu/gpu_messages.h
|
| @@ -147,7 +147,7 @@ IPC_STRUCT_BEGIN(GpuStreamTextureMsg_MatrixChanged_Params)
|
| IPC_STRUCT_END()
|
| #endif
|
|
|
| - IPC_STRUCT_TRAITS_BEGIN(gpu::DxDiagNode)
|
| +IPC_STRUCT_TRAITS_BEGIN(gpu::DxDiagNode)
|
| IPC_STRUCT_TRAITS_MEMBER(values)
|
| IPC_STRUCT_TRAITS_MEMBER(children)
|
| IPC_STRUCT_TRAITS_END()
|
| @@ -275,6 +275,13 @@ IPC_MESSAGE_CONTROL5(GpuMsg_CreateViewCommandBuffer,
|
| GPUCreateCommandBufferConfig, /* init_params */
|
| int32 /* route_id */)
|
|
|
| +// Tells the GPU process to create a new stream texture for rendering video.
|
| +IPC_MESSAGE_CONTROL4(GpuMsg_CreateStreamTexture,
|
| + int32, /* image_id */
|
| + int32, /* client_id */
|
| + int32, /* route_id */
|
| + int32 /* stream_id */)
|
| +
|
| // Tells the GPU process to create a new gpu memory buffer.
|
| IPC_MESSAGE_CONTROL1(GpuMsg_CreateGpuMemoryBuffer,
|
| GpuMsg_CreateGpuMemoryBuffer_Params)
|
| @@ -356,6 +363,14 @@ IPC_SYNC_MESSAGE_CONTROL3_1(GpuHostMsg_CreateViewCommandBuffer,
|
| int32, /* route_id */
|
| content::CreateCommandBufferResult /* result */)
|
|
|
| +// A renderer sends this to the browser process when it wants to
|
| +// create a streamtexture.
|
| +IPC_SYNC_MESSAGE_CONTROL3_1(GpuHostMsg_CreateStreamTexture,
|
| + int32, /* image_id */
|
| + int32, /* route_id */
|
| + int32, /* stream_id */
|
| + bool /*result*/)
|
| +
|
| // Response from GPU to a GputMsg_Initialize message.
|
| IPC_MESSAGE_CONTROL2(GpuHostMsg_Initialized,
|
| bool /* result */,
|
| @@ -383,6 +398,9 @@ IPC_MESSAGE_CONTROL1(GpuMsg_LoadedShader,
|
| IPC_MESSAGE_CONTROL1(GpuHostMsg_CommandBufferCreated,
|
| content::CreateCommandBufferResult /* result */)
|
|
|
| +// Respond from GPU to a GpuHostMsg_StreamTextureCreated message.
|
| +IPC_MESSAGE_CONTROL1(GpuHostMsg_StreamTextureCreated, unsigned /* result */)
|
| +
|
| // Request from GPU to free the browser resources associated with the
|
| // command buffer.
|
| IPC_MESSAGE_CONTROL1(GpuHostMsg_DestroyCommandBuffer,
|
| @@ -649,7 +667,7 @@ IPC_MESSAGE_ROUTED1(GpuCommandBufferMsg_DestroyImage,
|
| // Attaches an external image stream to the client texture.
|
| IPC_SYNC_MESSAGE_ROUTED2_1(GpuCommandBufferMsg_CreateStreamTexture,
|
| uint32, /* client_texture_id */
|
| - int32, /* stream_id */
|
| + int32, /* stream_id */
|
| bool /* succeeded */)
|
|
|
| //------------------------------------------------------------------------------
|
|
|