Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / content / common / gpu / gpu_messages.h

diff --git a/src/content/common/gpu/gpu_messages.h b/src/content/common/gpu/gpu_messages.h
index 4ee0cab..ea76b6d 100644 (file)
--- a/src/content/common/gpu/gpu_messages.h
+++ b/src/content/common/gpu/gpu_messages.h
@@ -12,7 +12,6 @@
 #include "content/common/content_export.h"
 #include "content/common/gpu/gpu_memory_uma_stats.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
-#include "content/common/gpu/gpu_rendering_stats.h"
 #include "content/public/common/common_param_traits.h"
 #include "content/public/common/gpu_memory_stats.h"
 #include "gpu/command_buffer/common/capabilities.h"
@@ -42,6 +41,24 @@
 
 #define IPC_MESSAGE_START GpuMsgStart
 
+IPC_ENUM_TRAITS_MAX_VALUE(content::CauseForGpuLaunch,
+                          content::CAUSE_FOR_GPU_LAUNCH_MAX_ENUM - 1)
+IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuPreference,
+                          gfx::GpuPreferenceLast)
+IPC_ENUM_TRAITS_MAX_VALUE(gfx::SurfaceType,
+                          gfx::SURFACE_TYPE_LAST)
+IPC_ENUM_TRAITS_MAX_VALUE(gpu::MemoryAllocation::PriorityCutoff,
+                          gpu::MemoryAllocation::CUTOFF_LAST)
+IPC_ENUM_TRAITS_MAX_VALUE(gpu::error::ContextLostReason,
+                          gpu::error::kContextLostReasonLast)
+IPC_ENUM_TRAITS_MAX_VALUE(media::VideoEncodeAccelerator::Error,
+                          media::VideoEncodeAccelerator::kErrorMax)
+IPC_ENUM_TRAITS_MAX_VALUE(media::VideoFrame::Format,
+                          media::VideoFrame::HISTOGRAM_MAX)
+IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile,
+                              media::VIDEO_CODEC_PROFILE_MIN,
+                              media::VIDEO_CODEC_PROFILE_MAX)
+
 IPC_STRUCT_BEGIN(GPUCreateCommandBufferConfig)
   IPC_STRUCT_MEMBER(int32, share_group_id)
   IPC_STRUCT_MEMBER(std::vector<int>, attribs)
@@ -53,7 +70,7 @@ IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params)
   IPC_STRUCT_MEMBER(int32, surface_id)
   IPC_STRUCT_MEMBER(uint64, surface_handle)
   IPC_STRUCT_MEMBER(int32, route_id)
-  IPC_STRUCT_MEMBER(std::string, mailbox_name)
+  IPC_STRUCT_MEMBER(gpu::Mailbox, mailbox)
   IPC_STRUCT_MEMBER(gfx::Size, size)
   IPC_STRUCT_MEMBER(float, scale_factor)
   IPC_STRUCT_MEMBER(std::vector<ui::LatencyInfo>, latency_info)
@@ -67,7 +84,7 @@ IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params)
   IPC_STRUCT_MEMBER(int, y)
   IPC_STRUCT_MEMBER(int, width)
   IPC_STRUCT_MEMBER(int, height)
-  IPC_STRUCT_MEMBER(std::string, mailbox_name)
+  IPC_STRUCT_MEMBER(gpu::Mailbox, mailbox)
   IPC_STRUCT_MEMBER(gfx::Size, surface_size)
   IPC_STRUCT_MEMBER(float, surface_scale_factor)
   IPC_STRUCT_MEMBER(std::vector<ui::LatencyInfo>, latency_info)
@@ -78,7 +95,7 @@ IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceRelease_Params)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(AcceleratedSurfaceMsg_BufferPresented_Params)
-  IPC_STRUCT_MEMBER(std::string, mailbox_name)
+  IPC_STRUCT_MEMBER(gpu::Mailbox, mailbox)
   IPC_STRUCT_MEMBER(uint32, sync_point)
 #if defined(OS_MACOSX)
   IPC_STRUCT_MEMBER(int32, renderer_id)
@@ -201,7 +218,6 @@ IPC_STRUCT_TRAITS_BEGIN(gpu::MemoryAllocation)
   IPC_STRUCT_TRAITS_MEMBER(bytes_limit_when_visible)
   IPC_STRUCT_TRAITS_MEMBER(priority_cutoff_when_visible)
 IPC_STRUCT_TRAITS_END()
-IPC_ENUM_TRAITS(gpu::MemoryAllocation::PriorityCutoff)
 
 IPC_STRUCT_TRAITS_BEGIN(gpu::ManagedMemoryStats)
   IPC_STRUCT_TRAITS_MEMBER(bytes_required)
@@ -210,33 +226,12 @@ IPC_STRUCT_TRAITS_BEGIN(gpu::ManagedMemoryStats)
   IPC_STRUCT_TRAITS_MEMBER(backbuffer_requested)
 IPC_STRUCT_TRAITS_END()
 
-IPC_ENUM_TRAITS(gfx::SurfaceType)
 IPC_STRUCT_TRAITS_BEGIN(gfx::GLSurfaceHandle)
   IPC_STRUCT_TRAITS_MEMBER(handle)
   IPC_STRUCT_TRAITS_MEMBER(transport_type)
   IPC_STRUCT_TRAITS_MEMBER(parent_client_id)
 IPC_STRUCT_TRAITS_END()
 
-IPC_ENUM_TRAITS(content::CauseForGpuLaunch)
-IPC_ENUM_TRAITS(gfx::GpuPreference)
-IPC_ENUM_TRAITS(gpu::error::ContextLostReason)
-
-IPC_ENUM_TRAITS(media::VideoCodecProfile)
-
-IPC_STRUCT_TRAITS_BEGIN(content::GpuRenderingStats)
-  IPC_STRUCT_TRAITS_MEMBER(global_texture_upload_count)
-  IPC_STRUCT_TRAITS_MEMBER(global_total_texture_upload_time)
-  IPC_STRUCT_TRAITS_MEMBER(texture_upload_count)
-  IPC_STRUCT_TRAITS_MEMBER(total_texture_upload_time)
-  IPC_STRUCT_TRAITS_MEMBER(global_total_processing_commands_time)
-  IPC_STRUCT_TRAITS_MEMBER(total_processing_commands_time)
-  IPC_STRUCT_TRAITS_MEMBER(global_video_memory_bytes_allocated)
-IPC_STRUCT_TRAITS_END()
-
-IPC_ENUM_TRAITS(media::VideoFrame::Format)
-
-IPC_ENUM_TRAITS(media::VideoEncodeAccelerator::Error)
-
 //------------------------------------------------------------------------------
 // GPU Messages
 // These are messages from the browser to the GPU process.
@@ -462,30 +457,12 @@ IPC_SYNC_MESSAGE_CONTROL2_1(GpuChannelMsg_CreateOffscreenCommandBuffer,
 IPC_SYNC_MESSAGE_CONTROL1_0(GpuChannelMsg_DestroyCommandBuffer,
                             int32 /* instance_id */)
 
-// Generates n new unique mailbox names synchronously.
-IPC_SYNC_MESSAGE_CONTROL1_1(GpuChannelMsg_GenerateMailboxNames,
-                            unsigned, /* num */
-                            std::vector<gpu::Mailbox> /* mailbox_names */)
-
-// Generates n new unique mailbox names asynchronously.
-IPC_MESSAGE_CONTROL1(GpuChannelMsg_GenerateMailboxNamesAsync,
-                     unsigned /* num */)
-
-// Reply to GpuChannelMsg_GenerateMailboxNamesAsync.
-IPC_MESSAGE_CONTROL1(GpuChannelMsg_GenerateMailboxNamesReply,
-                     std::vector<gpu::Mailbox> /* mailbox_names */)
-
 // Create a new GPU-accelerated video encoder.
 IPC_SYNC_MESSAGE_CONTROL0_1(GpuChannelMsg_CreateVideoEncoder,
                             int32 /* route_id */)
 
 IPC_MESSAGE_CONTROL1(GpuChannelMsg_DestroyVideoEncoder, int32 /* route_id */)
 
-// Tells the GPU process to collect rendering stats.
-IPC_SYNC_MESSAGE_CONTROL1_1(GpuChannelMsg_CollectRenderingStatsForSurface,
-                            int32 /* surface_id */,
-                            content::GpuRenderingStats /* stats */)
-
 // Sent by DevTools agent in the inspected renderer process to initiate GPU
 // instrumentation events recording.
 IPC_SYNC_MESSAGE_CONTROL0_1(GpuChannelMsg_DevToolsStartEventsRecording,