| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Multiply-included message file, hence no include guard here, but see below | 5 // Multiply-included message file, hence no include guard here, but see below |
| 6 // for a much smaller-than-usual include guard section. | 6 // for a much smaller-than-usual include guard section. |
| 7 | 7 |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "content/common/content_export.h" | 9 #include "content/common/content_export.h" |
| 10 #include "content/common/establish_channel_params.h" | 10 #include "content/common/establish_channel_params.h" |
| 11 #include "gpu/command_buffer/common/sync_token.h" | 11 #include "gpu/command_buffer/common/sync_token.h" |
| 12 #include "gpu/command_buffer/service/gpu_preferences.h" | 12 #include "gpu/command_buffer/service/gpu_preferences.h" |
| 13 #include "gpu/config/gpu_info.h" | 13 #include "gpu/config/gpu_info.h" |
| 14 #include "gpu/ipc/common/gpu_command_buffer_traits.h" | 14 #include "gpu/ipc/common/gpu_command_buffer_traits.h" |
| 15 #include "gpu/ipc/common/gpu_memory_uma_stats.h" | |
| 16 #include "gpu/ipc/common/gpu_param_traits.h" | 15 #include "gpu/ipc/common/gpu_param_traits.h" |
| 17 #include "gpu/ipc/common/memory_stats.h" | 16 #include "gpu/ipc/common/memory_stats.h" |
| 18 #include "gpu/ipc/common/surface_handle.h" | 17 #include "gpu/ipc/common/surface_handle.h" |
| 19 #include "ipc/ipc_channel_handle.h" | 18 #include "ipc/ipc_channel_handle.h" |
| 20 #include "ipc/ipc_message_macros.h" | 19 #include "ipc/ipc_message_macros.h" |
| 21 #include "ipc/ipc_message_start.h" | 20 #include "ipc/ipc_message_start.h" |
| 22 #include "ui/events/ipc/latency_info_param_traits.h" | 21 #include "ui/events/ipc/latency_info_param_traits.h" |
| 23 #include "ui/gfx/gpu_memory_buffer.h" | 22 #include "ui/gfx/gpu_memory_buffer.h" |
| 24 #include "ui/gfx/ipc/gfx_param_traits.h" | 23 #include "ui/gfx/ipc/gfx_param_traits.h" |
| 25 #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h" | 24 #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h" |
| 26 #include "url/gurl.h" | 25 #include "url/gurl.h" |
| 27 #include "url/ipc/url_param_traits.h" | 26 #include "url/ipc/url_param_traits.h" |
| 28 | 27 |
| 29 #undef IPC_MESSAGE_EXPORT | 28 #undef IPC_MESSAGE_EXPORT |
| 30 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 29 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 31 | 30 |
| 32 #define IPC_MESSAGE_START GpuMsgStart | 31 #define IPC_MESSAGE_START GpuMsgStart |
| 33 | 32 |
| 34 IPC_ENUM_TRAITS_VALIDATE(gpu::GpuPreferences::VpxDecodeVendors, | 33 IPC_ENUM_TRAITS_VALIDATE(gpu::GpuPreferences::VpxDecodeVendors, |
| 35 ((value >= gpu::GpuPreferences::VPX_VENDOR_NONE) && | 34 ((value >= gpu::GpuPreferences::VPX_VENDOR_NONE) && |
| 36 (value <= gpu::GpuPreferences::VPX_VENDOR_ALL))) | 35 (value <= gpu::GpuPreferences::VPX_VENDOR_ALL))) |
| 37 | 36 |
| 38 IPC_STRUCT_TRAITS_BEGIN(gpu::GPUMemoryUmaStats) | |
| 39 IPC_STRUCT_TRAITS_MEMBER(bytes_allocated_current) | |
| 40 IPC_STRUCT_TRAITS_MEMBER(bytes_allocated_max) | |
| 41 IPC_STRUCT_TRAITS_END() | |
| 42 | |
| 43 IPC_STRUCT_TRAITS_BEGIN(gpu::VideoMemoryUsageStats) | 37 IPC_STRUCT_TRAITS_BEGIN(gpu::VideoMemoryUsageStats) |
| 44 IPC_STRUCT_TRAITS_MEMBER(process_map) | 38 IPC_STRUCT_TRAITS_MEMBER(process_map) |
| 45 IPC_STRUCT_TRAITS_MEMBER(bytes_allocated) | 39 IPC_STRUCT_TRAITS_MEMBER(bytes_allocated) |
| 46 IPC_STRUCT_TRAITS_MEMBER(bytes_allocated_historical_max) | |
| 47 IPC_STRUCT_TRAITS_END() | 40 IPC_STRUCT_TRAITS_END() |
| 48 | 41 |
| 49 IPC_STRUCT_TRAITS_BEGIN(gpu::VideoMemoryUsageStats::ProcessStats) | 42 IPC_STRUCT_TRAITS_BEGIN(gpu::VideoMemoryUsageStats::ProcessStats) |
| 50 IPC_STRUCT_TRAITS_MEMBER(video_memory) | 43 IPC_STRUCT_TRAITS_MEMBER(video_memory) |
| 51 IPC_STRUCT_TRAITS_MEMBER(has_duplicates) | 44 IPC_STRUCT_TRAITS_MEMBER(has_duplicates) |
| 52 IPC_STRUCT_TRAITS_END() | 45 IPC_STRUCT_TRAITS_END() |
| 53 | 46 |
| 54 IPC_STRUCT_BEGIN(GpuMsg_CreateGpuMemoryBuffer_Params) | 47 IPC_STRUCT_BEGIN(GpuMsg_CreateGpuMemoryBuffer_Params) |
| 55 IPC_STRUCT_MEMBER(gfx::GpuMemoryBufferId, id) | 48 IPC_STRUCT_MEMBER(gfx::GpuMemoryBufferId, id) |
| 56 IPC_STRUCT_MEMBER(gfx::Size, size) | 49 IPC_STRUCT_MEMBER(gfx::Size, size) |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 | 220 |
| 228 IPC_MESSAGE_CONTROL1(GpuHostMsg_DidCreateOffscreenContext, GURL /* url */) | 221 IPC_MESSAGE_CONTROL1(GpuHostMsg_DidCreateOffscreenContext, GURL /* url */) |
| 229 | 222 |
| 230 IPC_MESSAGE_CONTROL3(GpuHostMsg_DidLoseContext, | 223 IPC_MESSAGE_CONTROL3(GpuHostMsg_DidLoseContext, |
| 231 bool /* offscreen */, | 224 bool /* offscreen */, |
| 232 gpu::error::ContextLostReason /* reason */, | 225 gpu::error::ContextLostReason /* reason */, |
| 233 GURL /* url */) | 226 GURL /* url */) |
| 234 | 227 |
| 235 IPC_MESSAGE_CONTROL1(GpuHostMsg_DidDestroyOffscreenContext, GURL /* url */) | 228 IPC_MESSAGE_CONTROL1(GpuHostMsg_DidDestroyOffscreenContext, GURL /* url */) |
| 236 | 229 |
| 237 // Tells the browser about GPU memory usage statistics for UMA logging. | |
| 238 IPC_MESSAGE_CONTROL1(GpuHostMsg_GpuMemoryUmaStats, | |
| 239 gpu::GPUMemoryUmaStats /* GPU memory UMA stats */) | |
| 240 | |
| 241 // Message from GPU to add a GPU log message to the about:gpu page. | 230 // Message from GPU to add a GPU log message to the about:gpu page. |
| 242 IPC_MESSAGE_CONTROL3(GpuHostMsg_OnLogMessage, | 231 IPC_MESSAGE_CONTROL3(GpuHostMsg_OnLogMessage, |
| 243 int /*severity*/, | 232 int /*severity*/, |
| 244 std::string /* header */, | 233 std::string /* header */, |
| 245 std::string /* message */) | 234 std::string /* message */) |
| 246 | 235 |
| 247 // Sent by the GPU process to indicate that a fields trial has been activated. | 236 // Sent by the GPU process to indicate that a fields trial has been activated. |
| 248 IPC_MESSAGE_CONTROL1(GpuHostMsg_FieldTrialActivated, std::string /* name */) | 237 IPC_MESSAGE_CONTROL1(GpuHostMsg_FieldTrialActivated, std::string /* name */) |
| OLD | NEW |