| 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/shared_memory.h" | 11 #include "base/shared_memory.h" |
| 12 #include "content/common/content_export.h" | 12 #include "content/common/content_export.h" |
| 13 #include "content/common/gpu/gpu_memory_allocation.h" | 13 #include "content/common/gpu/gpu_memory_allocation.h" |
| 14 #include "content/common/gpu/gpu_memory_uma_stats.h" | 14 #include "content/common/gpu/gpu_memory_uma_stats.h" |
| 15 #include "content/common/gpu/gpu_process_launch_causes.h" | 15 #include "content/common/gpu/gpu_process_launch_causes.h" |
| 16 #include "content/common/gpu/gpu_rendering_stats.h" | 16 #include "content/common/gpu/gpu_rendering_stats.h" |
| 17 #include "content/public/common/common_param_traits.h" | 17 #include "content/public/common/common_param_traits.h" |
| 18 #include "content/public/common/gpu_info.h" | 18 #include "content/public/common/gpu_info.h" |
| 19 #include "content/public/common/gpu_memory_stats.h" | 19 #include "content/public/common/gpu_memory_stats.h" |
| 20 #include "gpu/command_buffer/common/command_buffer.h" | 20 #include "gpu/command_buffer/common/command_buffer.h" |
| 21 #include "gpu/command_buffer/common/constants.h" | 21 #include "gpu/command_buffer/common/constants.h" |
| 22 #include "gpu/command_buffer/common/mailbox.h" |
| 22 #include "gpu/ipc/gpu_command_buffer_traits.h" | 23 #include "gpu/ipc/gpu_command_buffer_traits.h" |
| 23 #include "ipc/ipc_channel_handle.h" | 24 #include "ipc/ipc_channel_handle.h" |
| 24 #include "ipc/ipc_message_macros.h" | 25 #include "ipc/ipc_message_macros.h" |
| 25 #include "media/video/video_decode_accelerator.h" | 26 #include "media/video/video_decode_accelerator.h" |
| 26 #include "ui/gfx/native_widget_types.h" | 27 #include "ui/gfx/native_widget_types.h" |
| 27 #include "ui/gfx/size.h" | 28 #include "ui/gfx/size.h" |
| 28 #include "ui/gl/gpu_preference.h" | 29 #include "ui/gl/gpu_preference.h" |
| 29 #include "ui/surface/transport_dib.h" | 30 #include "ui/surface/transport_dib.h" |
| 30 | 31 |
| 31 #if defined(OS_ANDROID) | 32 #if defined(OS_ANDROID) |
| 32 #include "content/common/android/surface_texture_peer.h" | 33 #include "content/common/android/surface_texture_peer.h" |
| 33 #endif | 34 #endif |
| 34 | 35 |
| 35 #define IPC_MESSAGE_START GpuMsgStart | 36 #define IPC_MESSAGE_START GpuMsgStart |
| 36 | 37 |
| 37 IPC_STRUCT_BEGIN(GPUCreateCommandBufferConfig) | 38 IPC_STRUCT_BEGIN(GPUCreateCommandBufferConfig) |
| 38 IPC_STRUCT_MEMBER(int32, share_group_id) | 39 IPC_STRUCT_MEMBER(int32, share_group_id) |
| 39 IPC_STRUCT_MEMBER(std::string, allowed_extensions) | 40 IPC_STRUCT_MEMBER(std::string, allowed_extensions) |
| 40 IPC_STRUCT_MEMBER(std::vector<int>, attribs) | 41 IPC_STRUCT_MEMBER(std::vector<int>, attribs) |
| 41 IPC_STRUCT_MEMBER(GURL, active_url) | 42 IPC_STRUCT_MEMBER(GURL, active_url) |
| 42 IPC_STRUCT_MEMBER(gfx::GpuPreference, gpu_preference) | 43 IPC_STRUCT_MEMBER(gfx::GpuPreference, gpu_preference) |
| 43 IPC_STRUCT_END() | 44 IPC_STRUCT_END() |
| 44 | 45 |
| 45 #undef IPC_MESSAGE_EXPORT | 46 #undef IPC_MESSAGE_EXPORT |
| 46 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 47 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 47 IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params) | 48 IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params) |
| 48 IPC_STRUCT_MEMBER(int32, surface_id) | 49 IPC_STRUCT_MEMBER(int32, surface_id) |
| 49 IPC_STRUCT_MEMBER(uint64, surface_handle) | 50 IPC_STRUCT_MEMBER(uint64, surface_handle) |
| 50 IPC_STRUCT_MEMBER(int32, route_id) | 51 IPC_STRUCT_MEMBER(int32, route_id) |
| 51 IPC_STRUCT_MEMBER(std::string, mailbox_name) | 52 IPC_STRUCT_MEMBER(gpu::Mailbox, mailbox_name) |
| 52 IPC_STRUCT_MEMBER(gfx::Size, size) | 53 IPC_STRUCT_MEMBER(gfx::Size, size) |
| 53 #if defined(OS_MACOSX) | 54 #if defined(OS_MACOSX) |
| 54 IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window) | 55 IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window) |
| 55 #endif | 56 #endif |
| 56 IPC_STRUCT_END() | 57 IPC_STRUCT_END() |
| 57 #undef IPC_MESSAGE_EXPORT | 58 #undef IPC_MESSAGE_EXPORT |
| 58 #define IPC_MESSAGE_EXPORT | 59 #define IPC_MESSAGE_EXPORT |
| 59 | 60 |
| 60 IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params) | 61 IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params) |
| 61 IPC_STRUCT_MEMBER(int32, surface_id) | 62 IPC_STRUCT_MEMBER(int32, surface_id) |
| 62 IPC_STRUCT_MEMBER(uint64, surface_handle) | 63 IPC_STRUCT_MEMBER(uint64, surface_handle) |
| 63 IPC_STRUCT_MEMBER(int32, route_id) | 64 IPC_STRUCT_MEMBER(int32, route_id) |
| 64 IPC_STRUCT_MEMBER(int, x) | 65 IPC_STRUCT_MEMBER(int, x) |
| 65 IPC_STRUCT_MEMBER(int, y) | 66 IPC_STRUCT_MEMBER(int, y) |
| 66 IPC_STRUCT_MEMBER(int, width) | 67 IPC_STRUCT_MEMBER(int, width) |
| 67 IPC_STRUCT_MEMBER(int, height) | 68 IPC_STRUCT_MEMBER(int, height) |
| 68 IPC_STRUCT_MEMBER(std::string, mailbox_name) | 69 IPC_STRUCT_MEMBER(gpu::Mailbox, mailbox_name) |
| 69 IPC_STRUCT_MEMBER(gfx::Size, surface_size) | 70 IPC_STRUCT_MEMBER(gfx::Size, surface_size) |
| 70 #if defined(OS_MACOSX) | 71 #if defined(OS_MACOSX) |
| 71 IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window) | 72 IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window) |
| 72 #endif | 73 #endif |
| 73 IPC_STRUCT_END() | 74 IPC_STRUCT_END() |
| 74 | 75 |
| 75 IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceRelease_Params) | 76 IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceRelease_Params) |
| 76 IPC_STRUCT_MEMBER(int32, surface_id) | 77 IPC_STRUCT_MEMBER(int32, surface_id) |
| 77 IPC_STRUCT_MEMBER(int32, route_id) | 78 IPC_STRUCT_MEMBER(int32, route_id) |
| 78 IPC_STRUCT_END() | 79 IPC_STRUCT_END() |
| 79 | 80 |
| 80 IPC_STRUCT_BEGIN(AcceleratedSurfaceMsg_BufferPresented_Params) | 81 IPC_STRUCT_BEGIN(AcceleratedSurfaceMsg_BufferPresented_Params) |
| 81 IPC_STRUCT_MEMBER(std::string, mailbox_name) | 82 IPC_STRUCT_MEMBER(gpu::Mailbox, mailbox_name) |
| 82 IPC_STRUCT_MEMBER(uint32, sync_point) | 83 IPC_STRUCT_MEMBER(uint32, sync_point) |
| 83 #if defined(OS_MACOSX) | 84 #if defined(OS_MACOSX) |
| 84 IPC_STRUCT_MEMBER(int32, renderer_id) | 85 IPC_STRUCT_MEMBER(int32, renderer_id) |
| 85 #endif | 86 #endif |
| 86 IPC_STRUCT_END() | 87 IPC_STRUCT_END() |
| 87 | 88 |
| 88 IPC_STRUCT_BEGIN(GPUCommandBufferConsoleMessage) | 89 IPC_STRUCT_BEGIN(GPUCommandBufferConsoleMessage) |
| 89 IPC_STRUCT_MEMBER(int32, id) | 90 IPC_STRUCT_MEMBER(int32, id) |
| 90 IPC_STRUCT_MEMBER(std::string, message) | 91 IPC_STRUCT_MEMBER(std::string, message) |
| 91 IPC_STRUCT_END() | 92 IPC_STRUCT_END() |
| (...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 662 | 663 |
| 663 // Confirm decoder has been flushed. | 664 // Confirm decoder has been flushed. |
| 664 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_FlushDone) | 665 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_FlushDone) |
| 665 | 666 |
| 666 // Confirm decoder has been reset. | 667 // Confirm decoder has been reset. |
| 667 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_ResetDone) | 668 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_ResetDone) |
| 668 | 669 |
| 669 // Video decoder has encountered an error. | 670 // Video decoder has encountered an error. |
| 670 IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_ErrorNotification, | 671 IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_ErrorNotification, |
| 671 uint32) /* Error ID */ | 672 uint32) /* Error ID */ |
| OLD | NEW |