| Index: content/common/gpu/gpu_messages.h
|
| diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h
|
| index 2a6ddafd2944858b90af984983babfa2b3be2215..eaffe5ac1880c897db81aae85460bcc8f594010f 100644
|
| --- a/content/common/gpu/gpu_messages.h
|
| +++ b/content/common/gpu/gpu_messages.h
|
| @@ -25,6 +25,10 @@
|
| #include "ui/gl/gpu_preference.h"
|
| #include "ui/surface/transport_dib.h"
|
|
|
| +#if defined(OS_ANDROID)
|
| +#include "content/common/android/surface_texture_peer.h"
|
| +#endif
|
| +
|
| #define IPC_MESSAGE_START GpuMsgStart
|
|
|
| IPC_STRUCT_BEGIN(GPUCreateCommandBufferConfig)
|
| @@ -89,6 +93,28 @@ IPC_STRUCT_BEGIN(GPUCommandBufferConsoleMessage)
|
| IPC_STRUCT_MEMBER(std::string, message)
|
| IPC_STRUCT_END()
|
|
|
| +#if defined(OS_ANDROID)
|
| +IPC_STRUCT_BEGIN(GpuStreamTextureMsg_MatrixChanged_Params)
|
| + IPC_STRUCT_MEMBER(float, m00)
|
| + IPC_STRUCT_MEMBER(float, m01)
|
| + IPC_STRUCT_MEMBER(float, m02)
|
| + IPC_STRUCT_MEMBER(float, m03)
|
| + IPC_STRUCT_MEMBER(float, m10)
|
| + IPC_STRUCT_MEMBER(float, m11)
|
| + IPC_STRUCT_MEMBER(float, m12)
|
| + IPC_STRUCT_MEMBER(float, m13)
|
| + IPC_STRUCT_MEMBER(float, m20)
|
| + IPC_STRUCT_MEMBER(float, m21)
|
| + IPC_STRUCT_MEMBER(float, m22)
|
| + IPC_STRUCT_MEMBER(float, m23)
|
| + IPC_STRUCT_MEMBER(float, m30)
|
| + IPC_STRUCT_MEMBER(float, m31)
|
| + IPC_STRUCT_MEMBER(float, m32)
|
| + IPC_STRUCT_MEMBER(float, m33)
|
| +IPC_STRUCT_END()
|
| +IPC_ENUM_TRAITS(content::SurfaceTexturePeer::SurfaceTextureTarget)
|
| +#endif
|
| +
|
| IPC_STRUCT_TRAITS_BEGIN(content::DxDiagNode)
|
| IPC_STRUCT_TRAITS_MEMBER(values)
|
| IPC_STRUCT_TRAITS_MEMBER(children)
|
| @@ -311,6 +337,34 @@ IPC_SYNC_MESSAGE_CONTROL2_1(GpuChannelMsg_CreateOffscreenCommandBuffer,
|
| IPC_SYNC_MESSAGE_CONTROL1_0(GpuChannelMsg_DestroyCommandBuffer,
|
| int32 /* instance_id */)
|
|
|
| +
|
| +#if defined(OS_ANDROID)
|
| +// Register the StreamTextureProxy class with the GPU process, so that
|
| +// the renderer process will get notified whenever a frame becomes available.
|
| +IPC_SYNC_MESSAGE_CONTROL2_1(GpuChannelMsg_RegisterStreamTextureProxy,
|
| + int32, /* stream_id */
|
| + gfx::Size, /* initial_size */
|
| + int /* route_id */)
|
| +
|
| +// Tells the GPU process create and send the java surface texture object to
|
| +// the renderer process through the binder thread.
|
| +IPC_MESSAGE_CONTROL4(GpuChannelMsg_EstablishStreamTexture,
|
| + int32, /* stream_id */
|
| + content::SurfaceTexturePeer::SurfaceTextureTarget,
|
| + /* type */
|
| + int32, /* primary_id */
|
| + int32 /* secondary_id */)
|
| +
|
| +//------------------------------------------------------------------------------
|
| +// Stream Texture Messages
|
| +// Inform the renderer that a new frame is available.
|
| +IPC_MESSAGE_ROUTED0(GpuStreamTextureMsg_FrameAvailable)
|
| +
|
| +// Inform the renderer process that the transform matrix has changed.
|
| +IPC_MESSAGE_ROUTED1(GpuStreamTextureMsg_MatrixChanged,
|
| + GpuStreamTextureMsg_MatrixChanged_Params /* params */)
|
| +#endif
|
| +
|
| //------------------------------------------------------------------------------
|
| // GPU Command Buffer Messages
|
| // These are messages between a renderer process to the GPU process relating to
|
|
|