Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: ppapi/proxy/ppapi_messages.h

Issue 298023004: [PPAPI] Compositor API implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@compositor_api_def_new
Patch Set: Fix review issues and rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 header, no traditional include guard. 5 // Multiply-included message header, no traditional include guard.
6 #include <map> 6 #include <map>
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 19 matching lines...) Expand all
30 #include "ppapi/c/pp_codecs.h" 30 #include "ppapi/c/pp_codecs.h"
31 #include "ppapi/c/pp_file_info.h" 31 #include "ppapi/c/pp_file_info.h"
32 #include "ppapi/c/pp_instance.h" 32 #include "ppapi/c/pp_instance.h"
33 #include "ppapi/c/pp_module.h" 33 #include "ppapi/c/pp_module.h"
34 #include "ppapi/c/pp_point.h" 34 #include "ppapi/c/pp_point.h"
35 #include "ppapi/c/pp_rect.h" 35 #include "ppapi/c/pp_rect.h"
36 #include "ppapi/c/pp_resource.h" 36 #include "ppapi/c/pp_resource.h"
37 #include "ppapi/c/pp_size.h" 37 #include "ppapi/c/pp_size.h"
38 #include "ppapi/c/pp_time.h" 38 #include "ppapi/c/pp_time.h"
39 #include "ppapi/c/ppb_audio_config.h" 39 #include "ppapi/c/ppb_audio_config.h"
40 #include "ppapi/c/ppb_compositor_layer.h"
40 #include "ppapi/c/ppb_image_data.h" 41 #include "ppapi/c/ppb_image_data.h"
41 #include "ppapi/c/ppb_tcp_socket.h" 42 #include "ppapi/c/ppb_tcp_socket.h"
42 #include "ppapi/c/ppb_text_input_controller.h" 43 #include "ppapi/c/ppb_text_input_controller.h"
43 #include "ppapi/c/ppb_udp_socket.h" 44 #include "ppapi/c/ppb_udp_socket.h"
44 #include "ppapi/c/private/pp_content_decryptor.h" 45 #include "ppapi/c/private/pp_content_decryptor.h"
45 #include "ppapi/c/private/pp_private_font_charset.h" 46 #include "ppapi/c/private/pp_private_font_charset.h"
46 #include "ppapi/c/private/ppb_flash.h" 47 #include "ppapi/c/private/ppb_flash.h"
47 #include "ppapi/c/private/ppb_host_resolver_private.h" 48 #include "ppapi/c/private/ppb_host_resolver_private.h"
48 #include "ppapi/c/private/ppb_isolated_file_system_private.h" 49 #include "ppapi/c/private/ppb_isolated_file_system_private.h"
49 #include "ppapi/c/private/ppb_net_address_private.h" 50 #include "ppapi/c/private/ppb_net_address_private.h"
50 #include "ppapi/c/private/ppb_pdf.h" 51 #include "ppapi/c/private/ppb_pdf.h"
51 #include "ppapi/c/private/ppb_talk_private.h" 52 #include "ppapi/c/private/ppb_talk_private.h"
52 #include "ppapi/c/private/ppp_flash_browser_operations.h" 53 #include "ppapi/c/private/ppp_flash_browser_operations.h"
53 #include "ppapi/proxy/host_resolver_private_resource.h" 54 #include "ppapi/proxy/host_resolver_private_resource.h"
54 #include "ppapi/proxy/network_list_resource.h" 55 #include "ppapi/proxy/network_list_resource.h"
55 #include "ppapi/proxy/ppapi_param_traits.h" 56 #include "ppapi/proxy/ppapi_param_traits.h"
56 #include "ppapi/proxy/ppapi_proxy_export.h" 57 #include "ppapi/proxy/ppapi_proxy_export.h"
57 #include "ppapi/proxy/resource_message_params.h" 58 #include "ppapi/proxy/resource_message_params.h"
58 #include "ppapi/proxy/serialized_flash_menu.h" 59 #include "ppapi/proxy/serialized_flash_menu.h"
59 #include "ppapi/proxy/serialized_handle.h" 60 #include "ppapi/proxy/serialized_handle.h"
60 #include "ppapi/proxy/serialized_structs.h" 61 #include "ppapi/proxy/serialized_structs.h"
61 #include "ppapi/proxy/serialized_var.h" 62 #include "ppapi/proxy/serialized_var.h"
63 #include "ppapi/shared_impl/compositor_layer_data.h"
62 #include "ppapi/shared_impl/dir_contents.h" 64 #include "ppapi/shared_impl/dir_contents.h"
63 #include "ppapi/shared_impl/file_growth.h" 65 #include "ppapi/shared_impl/file_growth.h"
64 #include "ppapi/shared_impl/file_path.h" 66 #include "ppapi/shared_impl/file_path.h"
65 #include "ppapi/shared_impl/file_ref_create_info.h" 67 #include "ppapi/shared_impl/file_ref_create_info.h"
66 #include "ppapi/shared_impl/media_stream_audio_track_shared.h" 68 #include "ppapi/shared_impl/media_stream_audio_track_shared.h"
67 #include "ppapi/shared_impl/media_stream_video_track_shared.h" 69 #include "ppapi/shared_impl/media_stream_video_track_shared.h"
68 #include "ppapi/shared_impl/ppapi_nacl_plugin_args.h" 70 #include "ppapi/shared_impl/ppapi_nacl_plugin_args.h"
69 #include "ppapi/shared_impl/ppapi_preferences.h" 71 #include "ppapi/shared_impl/ppapi_preferences.h"
70 #include "ppapi/shared_impl/ppb_device_ref_shared.h" 72 #include "ppapi/shared_impl/ppb_device_ref_shared.h"
71 #include "ppapi/shared_impl/ppb_input_event_shared.h" 73 #include "ppapi/shared_impl/ppb_input_event_shared.h"
72 #include "ppapi/shared_impl/ppb_tcp_socket_shared.h" 74 #include "ppapi/shared_impl/ppb_tcp_socket_shared.h"
73 #include "ppapi/shared_impl/ppb_view_shared.h" 75 #include "ppapi/shared_impl/ppb_view_shared.h"
74 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h" 76 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h"
75 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" 77 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h"
76 #include "ppapi/shared_impl/socket_option_data.h" 78 #include "ppapi/shared_impl/socket_option_data.h"
77 #include "ppapi/shared_impl/url_request_info_data.h" 79 #include "ppapi/shared_impl/url_request_info_data.h"
78 #include "ppapi/shared_impl/url_response_info_data.h" 80 #include "ppapi/shared_impl/url_response_info_data.h"
79 #include "ui/events/ipc/latency_info_param_traits.h" 81 #include "ui/events/ipc/latency_info_param_traits.h"
80 82
81 #undef IPC_MESSAGE_EXPORT 83 #undef IPC_MESSAGE_EXPORT
82 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT 84 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT
83 85
84 #define IPC_MESSAGE_START PpapiMsgStart 86 #define IPC_MESSAGE_START PpapiMsgStart
85 87
86 IPC_ENUM_TRAITS_MAX_VALUE(ppapi::TCPSocketVersion, 88 IPC_ENUM_TRAITS_MAX_VALUE(ppapi::TCPSocketVersion,
87 ppapi::TCP_SOCKET_VERSION_1_1_OR_ABOVE) 89 ppapi::TCP_SOCKET_VERSION_1_1_OR_ABOVE)
90 IPC_ENUM_TRAITS_MAX_VALUE(ppapi::CompositorLayerData::Type,
91 ppapi::CompositorLayerData::TYPE_LAST)
88 IPC_ENUM_TRAITS(PP_AudioSampleRate) 92 IPC_ENUM_TRAITS(PP_AudioSampleRate)
93 IPC_ENUM_TRAITS_MAX_VALUE(PP_BlendMode, PP_BLENDMODE_LAST)
89 IPC_ENUM_TRAITS(PP_DeviceType_Dev) 94 IPC_ENUM_TRAITS(PP_DeviceType_Dev)
90 IPC_ENUM_TRAITS(PP_DecryptorStreamType) 95 IPC_ENUM_TRAITS(PP_DecryptorStreamType)
91 IPC_ENUM_TRAITS_MAX_VALUE(PP_FileSystemType, PP_FILESYSTEMTYPE_ISOLATED) 96 IPC_ENUM_TRAITS_MAX_VALUE(PP_FileSystemType, PP_FILESYSTEMTYPE_ISOLATED)
92 IPC_ENUM_TRAITS_MAX_VALUE(PP_FileType, PP_FILETYPE_OTHER) 97 IPC_ENUM_TRAITS_MAX_VALUE(PP_FileType, PP_FILETYPE_OTHER)
93 IPC_ENUM_TRAITS(PP_Flash_BrowserOperations_Permission) 98 IPC_ENUM_TRAITS(PP_Flash_BrowserOperations_Permission)
94 IPC_ENUM_TRAITS(PP_Flash_BrowserOperations_SettingType) 99 IPC_ENUM_TRAITS(PP_Flash_BrowserOperations_SettingType)
95 IPC_ENUM_TRAITS(PP_FlashSetting) 100 IPC_ENUM_TRAITS(PP_FlashSetting)
96 IPC_ENUM_TRAITS(PP_ImageDataFormat) 101 IPC_ENUM_TRAITS(PP_ImageDataFormat)
97 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton) 102 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton)
98 IPC_ENUM_TRAITS(PP_InputEvent_Type) 103 IPC_ENUM_TRAITS(PP_InputEvent_Type)
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 IPC_STRUCT_TRAITS_BEGIN(PP_FloatPoint) 139 IPC_STRUCT_TRAITS_BEGIN(PP_FloatPoint)
135 IPC_STRUCT_TRAITS_MEMBER(x) 140 IPC_STRUCT_TRAITS_MEMBER(x)
136 IPC_STRUCT_TRAITS_MEMBER(y) 141 IPC_STRUCT_TRAITS_MEMBER(y)
137 IPC_STRUCT_TRAITS_END() 142 IPC_STRUCT_TRAITS_END()
138 143
139 IPC_STRUCT_TRAITS_BEGIN(PP_Size) 144 IPC_STRUCT_TRAITS_BEGIN(PP_Size)
140 IPC_STRUCT_TRAITS_MEMBER(height) 145 IPC_STRUCT_TRAITS_MEMBER(height)
141 IPC_STRUCT_TRAITS_MEMBER(width) 146 IPC_STRUCT_TRAITS_MEMBER(width)
142 IPC_STRUCT_TRAITS_END() 147 IPC_STRUCT_TRAITS_END()
143 148
149 IPC_STRUCT_TRAITS_BEGIN(PP_FloatSize)
150 IPC_STRUCT_TRAITS_MEMBER(height)
151 IPC_STRUCT_TRAITS_MEMBER(width)
152 IPC_STRUCT_TRAITS_END()
153
144 IPC_STRUCT_TRAITS_BEGIN(PP_Rect) 154 IPC_STRUCT_TRAITS_BEGIN(PP_Rect)
145 IPC_STRUCT_TRAITS_MEMBER(point) 155 IPC_STRUCT_TRAITS_MEMBER(point)
146 IPC_STRUCT_TRAITS_MEMBER(size) 156 IPC_STRUCT_TRAITS_MEMBER(size)
147 IPC_STRUCT_TRAITS_END() 157 IPC_STRUCT_TRAITS_END()
148 158
159 IPC_STRUCT_TRAITS_BEGIN(PP_FloatRect)
160 IPC_STRUCT_TRAITS_MEMBER(point)
161 IPC_STRUCT_TRAITS_MEMBER(size)
162 IPC_STRUCT_TRAITS_END()
163
149 IPC_STRUCT_TRAITS_BEGIN(PP_ImageDataDesc) 164 IPC_STRUCT_TRAITS_BEGIN(PP_ImageDataDesc)
150 IPC_STRUCT_TRAITS_MEMBER(format) 165 IPC_STRUCT_TRAITS_MEMBER(format)
151 IPC_STRUCT_TRAITS_MEMBER(size) 166 IPC_STRUCT_TRAITS_MEMBER(size)
152 IPC_STRUCT_TRAITS_MEMBER(stride) 167 IPC_STRUCT_TRAITS_MEMBER(stride)
153 IPC_STRUCT_TRAITS_END() 168 IPC_STRUCT_TRAITS_END()
154 169
155 IPC_STRUCT_TRAITS_BEGIN(PP_PictureBuffer_Dev) 170 IPC_STRUCT_TRAITS_BEGIN(PP_PictureBuffer_Dev)
156 IPC_STRUCT_TRAITS_MEMBER(id) 171 IPC_STRUCT_TRAITS_MEMBER(id)
157 IPC_STRUCT_TRAITS_MEMBER(size) 172 IPC_STRUCT_TRAITS_MEMBER(size)
158 IPC_STRUCT_TRAITS_MEMBER(texture_id) 173 IPC_STRUCT_TRAITS_MEMBER(texture_id)
(...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after
1277 int32_t /* min */, 1292 int32_t /* min */,
1278 int32_t /* max */, 1293 int32_t /* max */,
1279 uint32_t /* bucket_count */) 1294 uint32_t /* bucket_count */)
1280 IPC_MESSAGE_CONTROL3(PpapiHostMsg_UMA_HistogramEnumeration, 1295 IPC_MESSAGE_CONTROL3(PpapiHostMsg_UMA_HistogramEnumeration,
1281 std::string /* name */, 1296 std::string /* name */,
1282 int32_t /* sample */, 1297 int32_t /* sample */,
1283 int32_t /* boundary_value */) 1298 int32_t /* boundary_value */)
1284 IPC_MESSAGE_CONTROL0(PpapiHostMsg_UMA_IsCrashReportingEnabled); 1299 IPC_MESSAGE_CONTROL0(PpapiHostMsg_UMA_IsCrashReportingEnabled);
1285 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_UMA_IsCrashReportingEnabledReply); 1300 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_UMA_IsCrashReportingEnabledReply);
1286 1301
1302 // Compositor
1303 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Compositor_Create)
1304 IPC_MESSAGE_CONTROL2(PpapiHostMsg_Compositor_CommitLayers,
1305 std::vector<ppapi::CompositorLayerData> /* layers */,
1306 bool /* reset */)
1307 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Compositor_CommitLayersReply)
1308 IPC_MESSAGE_CONTROL3(PpapiPluginMsg_Compositor_ReleaseResource,
1309 int32_t /* id */,
1310 uint32_t /* sync_point */,
1311 bool /* is_lost */)
1312
1287 // File chooser. 1313 // File chooser.
1288 IPC_MESSAGE_CONTROL0(PpapiHostMsg_FileChooser_Create) 1314 IPC_MESSAGE_CONTROL0(PpapiHostMsg_FileChooser_Create)
1289 IPC_MESSAGE_CONTROL4(PpapiHostMsg_FileChooser_Show, 1315 IPC_MESSAGE_CONTROL4(PpapiHostMsg_FileChooser_Show,
1290 bool /* save_as */, 1316 bool /* save_as */,
1291 bool /* open_multiple */, 1317 bool /* open_multiple */,
1292 std::string /* suggested_file_name */, 1318 std::string /* suggested_file_name */,
1293 std::vector<std::string> /* accept_mime_types */) 1319 std::vector<std::string> /* accept_mime_types */)
1294 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FileChooser_ShowReply, 1320 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FileChooser_ShowReply,
1295 std::vector<ppapi::FileRefCreateInfo> /* files */) 1321 std::vector<ppapi::FileRefCreateInfo> /* files */)
1296 1322
(...skipping 874 matching lines...) Expand 10 before | Expand all | Expand 10 after
2171 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, 2197 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission,
2172 PP_TalkPermission /* permission */) 2198 PP_TalkPermission /* permission */)
2173 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) 2199 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply)
2174 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) 2200 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting)
2175 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) 2201 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply)
2176 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) 2202 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting)
2177 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) 2203 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply)
2178 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) 2204 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */)
2179 2205
2180 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) 2206 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698