| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/memory/shared_memory.h" | 11 #include "base/memory/shared_memory.h" |
| 12 #include "content/common/content_export.h" | 12 #include "content/common/content_export.h" |
| 13 #include "content/common/gpu/gpu_memory_uma_stats.h" | 13 #include "content/common/gpu/gpu_memory_uma_stats.h" |
| 14 #include "content/common/gpu/gpu_process_launch_causes.h" | 14 #include "content/common/gpu/gpu_process_launch_causes.h" |
| 15 #include "content/common/gpu/gpu_result_codes.h" |
| 15 #include "content/public/common/common_param_traits.h" | 16 #include "content/public/common/common_param_traits.h" |
| 16 #include "content/public/common/gpu_memory_stats.h" | 17 #include "content/public/common/gpu_memory_stats.h" |
| 17 #include "gpu/command_buffer/common/capabilities.h" | 18 #include "gpu/command_buffer/common/capabilities.h" |
| 18 #include "gpu/command_buffer/common/command_buffer.h" | 19 #include "gpu/command_buffer/common/command_buffer.h" |
| 19 #include "gpu/command_buffer/common/constants.h" | 20 #include "gpu/command_buffer/common/constants.h" |
| 20 #include "gpu/command_buffer/common/gpu_memory_allocation.h" | 21 #include "gpu/command_buffer/common/gpu_memory_allocation.h" |
| 21 #include "gpu/command_buffer/common/mailbox.h" | 22 #include "gpu/command_buffer/common/mailbox.h" |
| 22 #include "gpu/config/gpu_info.h" | 23 #include "gpu/config/gpu_info.h" |
| 23 #include "gpu/ipc/gpu_command_buffer_traits.h" | 24 #include "gpu/ipc/gpu_command_buffer_traits.h" |
| 24 #include "ipc/ipc_channel_handle.h" | 25 #include "ipc/ipc_channel_handle.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 36 #include "content/common/android/surface_texture_peer.h" | 37 #include "content/common/android/surface_texture_peer.h" |
| 37 #endif | 38 #endif |
| 38 | 39 |
| 39 #undef IPC_MESSAGE_EXPORT | 40 #undef IPC_MESSAGE_EXPORT |
| 40 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 41 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 41 | 42 |
| 42 #define IPC_MESSAGE_START GpuMsgStart | 43 #define IPC_MESSAGE_START GpuMsgStart |
| 43 | 44 |
| 44 IPC_ENUM_TRAITS_MAX_VALUE(content::CauseForGpuLaunch, | 45 IPC_ENUM_TRAITS_MAX_VALUE(content::CauseForGpuLaunch, |
| 45 content::CAUSE_FOR_GPU_LAUNCH_MAX_ENUM - 1) | 46 content::CAUSE_FOR_GPU_LAUNCH_MAX_ENUM - 1) |
| 47 IPC_ENUM_TRAITS_MAX_VALUE(content::CreateCommandBufferResult, |
| 48 content::CREATE_COMMAND_BUFFER_RESULT_LAST); |
| 46 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuPreference, | 49 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuPreference, |
| 47 gfx::GpuPreferenceLast) | 50 gfx::GpuPreferenceLast) |
| 48 IPC_ENUM_TRAITS_MAX_VALUE(gfx::SurfaceType, | 51 IPC_ENUM_TRAITS_MAX_VALUE(gfx::SurfaceType, |
| 49 gfx::SURFACE_TYPE_LAST) | 52 gfx::SURFACE_TYPE_LAST) |
| 50 IPC_ENUM_TRAITS_MAX_VALUE(gpu::MemoryAllocation::PriorityCutoff, | 53 IPC_ENUM_TRAITS_MAX_VALUE(gpu::MemoryAllocation::PriorityCutoff, |
| 51 gpu::MemoryAllocation::CUTOFF_LAST) | 54 gpu::MemoryAllocation::CUTOFF_LAST) |
| 52 IPC_ENUM_TRAITS_MAX_VALUE(gpu::error::ContextLostReason, | 55 IPC_ENUM_TRAITS_MAX_VALUE(gpu::error::ContextLostReason, |
| 53 gpu::error::kContextLostReasonLast) | 56 gpu::error::kContextLostReasonLast) |
| 54 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoEncodeAccelerator::Error, | 57 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoEncodeAccelerator::Error, |
| 55 media::VideoEncodeAccelerator::kErrorMax) | 58 media::VideoEncodeAccelerator::kErrorMax) |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 328 int /* client id */, | 331 int /* client id */, |
| 329 IPC::ChannelHandle /* handle to channel */, | 332 IPC::ChannelHandle /* handle to channel */, |
| 330 gpu::GPUInfo /* stats about GPU process*/) | 333 gpu::GPUInfo /* stats about GPU process*/) |
| 331 | 334 |
| 332 // A renderer sends this to the browser process when it wants to | 335 // A renderer sends this to the browser process when it wants to |
| 333 // create a GL context associated with the given view_id. | 336 // create a GL context associated with the given view_id. |
| 334 IPC_SYNC_MESSAGE_CONTROL3_1(GpuHostMsg_CreateViewCommandBuffer, | 337 IPC_SYNC_MESSAGE_CONTROL3_1(GpuHostMsg_CreateViewCommandBuffer, |
| 335 int32, /* surface_id */ | 338 int32, /* surface_id */ |
| 336 GPUCreateCommandBufferConfig, /* init_params */ | 339 GPUCreateCommandBufferConfig, /* init_params */ |
| 337 int32, /* route_id */ | 340 int32, /* route_id */ |
| 338 bool /* succeeded */) | 341 content::CreateCommandBufferResult /* result */) |
| 339 | 342 |
| 340 // Response from GPU to a GputMsg_Initialize message. | 343 // Response from GPU to a GputMsg_Initialize message. |
| 341 IPC_MESSAGE_CONTROL2(GpuHostMsg_Initialized, | 344 IPC_MESSAGE_CONTROL2(GpuHostMsg_Initialized, |
| 342 bool /* result */, | 345 bool /* result */, |
| 343 ::gpu::GPUInfo /* gpu_info */) | 346 ::gpu::GPUInfo /* gpu_info */) |
| 344 | 347 |
| 345 // Response from GPU to a GpuHostMsg_EstablishChannel message. | 348 // Response from GPU to a GpuHostMsg_EstablishChannel message. |
| 346 IPC_MESSAGE_CONTROL1(GpuHostMsg_ChannelEstablished, | 349 IPC_MESSAGE_CONTROL1(GpuHostMsg_ChannelEstablished, |
| 347 IPC::ChannelHandle /* channel_handle */) | 350 IPC::ChannelHandle /* channel_handle */) |
| 348 | 351 |
| 349 // Message from GPU to notify to destroy the channel. | 352 // Message from GPU to notify to destroy the channel. |
| 350 IPC_MESSAGE_CONTROL1(GpuHostMsg_DestroyChannel, | 353 IPC_MESSAGE_CONTROL1(GpuHostMsg_DestroyChannel, |
| 351 int32 /* client_id */) | 354 int32 /* client_id */) |
| 352 | 355 |
| 353 // Message to cache the given shader information. | 356 // Message to cache the given shader information. |
| 354 IPC_MESSAGE_CONTROL3(GpuHostMsg_CacheShader, | 357 IPC_MESSAGE_CONTROL3(GpuHostMsg_CacheShader, |
| 355 int32 /* client_id */, | 358 int32 /* client_id */, |
| 356 std::string /* key */, | 359 std::string /* key */, |
| 357 std::string /* shader */) | 360 std::string /* shader */) |
| 358 | 361 |
| 359 // Message to the GPU that a shader was loaded from disk. | 362 // Message to the GPU that a shader was loaded from disk. |
| 360 IPC_MESSAGE_CONTROL1(GpuMsg_LoadedShader, | 363 IPC_MESSAGE_CONTROL1(GpuMsg_LoadedShader, |
| 361 std::string /* encoded shader */) | 364 std::string /* encoded shader */) |
| 362 | 365 |
| 363 // Respond from GPU to a GpuMsg_CreateViewCommandBuffer message. | 366 // Respond from GPU to a GpuMsg_CreateViewCommandBuffer message. |
| 364 IPC_MESSAGE_CONTROL1(GpuHostMsg_CommandBufferCreated, | 367 IPC_MESSAGE_CONTROL1(GpuHostMsg_CommandBufferCreated, |
| 365 bool /* succeeded */) | 368 content::CreateCommandBufferResult /* result */) |
| 366 | 369 |
| 367 // Request from GPU to free the browser resources associated with the | 370 // Request from GPU to free the browser resources associated with the |
| 368 // command buffer. | 371 // command buffer. |
| 369 IPC_MESSAGE_CONTROL1(GpuHostMsg_DestroyCommandBuffer, | 372 IPC_MESSAGE_CONTROL1(GpuHostMsg_DestroyCommandBuffer, |
| 370 int32 /* surface_id */) | 373 int32 /* surface_id */) |
| 371 | 374 |
| 372 // Response from GPU to a GpuMsg_CreateImage message. | 375 // Response from GPU to a GpuMsg_CreateImage message. |
| 373 IPC_MESSAGE_CONTROL1(GpuHostMsg_ImageCreated, | 376 IPC_MESSAGE_CONTROL1(GpuHostMsg_ImageCreated, |
| 374 gfx::Size /* size */) | 377 gfx::Size /* size */) |
| 375 | 378 |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 769 int32 /* bitstream_buffer_id */, | 772 int32 /* bitstream_buffer_id */, |
| 770 uint32 /* payload_size */, | 773 uint32 /* payload_size */, |
| 771 bool /* key_frame */) | 774 bool /* key_frame */) |
| 772 | 775 |
| 773 // Report error condition. | 776 // Report error condition. |
| 774 IPC_MESSAGE_ROUTED1(AcceleratedVideoEncoderHostMsg_NotifyError, | 777 IPC_MESSAGE_ROUTED1(AcceleratedVideoEncoderHostMsg_NotifyError, |
| 775 media::VideoEncodeAccelerator::Error /* error */) | 778 media::VideoEncodeAccelerator::Error /* error */) |
| 776 | 779 |
| 777 // Send destroy request to the encoder. | 780 // Send destroy request to the encoder. |
| 778 IPC_MESSAGE_ROUTED0(AcceleratedVideoEncoderMsg_Destroy) | 781 IPC_MESSAGE_ROUTED0(AcceleratedVideoEncoderMsg_Destroy) |
| OLD | NEW |