Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index 8d9abe6f553442dafcdb8d65537ac9db9103d374..aca469c5bf956b8af8c58f94db21c9ca2894f7f8 100644 |
--- a/ppapi/proxy/ppapi_messages.h |
+++ b/ppapi/proxy/ppapi_messages.h |
@@ -1325,13 +1325,13 @@ IPC_MESSAGE_CONTROL2(PpapiHostMsg_ExtensionsCommon_Call, |
IPC_MESSAGE_CONTROL1(PpapiPluginMsg_ExtensionsCommon_CallReply, |
base::ListValue /* output */) |
-// Ext_CrxFileSystem |
+// Ext_CrxFileSystem ----------------------------------------------------------- |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_Ext_CrxFileSystem_Create) |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_Ext_CrxFileSystem_BrowserOpen) |
IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Ext_CrxFileSystem_BrowserOpenReply, |
std::string /* fsid */) |
-// File chooser. |
+// FileChooser ----------------------------------------------------------------- |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_FileChooser_Create) |
IPC_MESSAGE_CONTROL4(PpapiHostMsg_FileChooser_Show, |
bool /* save_as */, |
@@ -1341,7 +1341,7 @@ IPC_MESSAGE_CONTROL4(PpapiHostMsg_FileChooser_Show, |
IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FileChooser_ShowReply, |
std::vector<ppapi::PPB_FileRef_CreateInfo> /* files */) |
-// FileIO |
+// FileIO ---------------------------------------------------------------------- |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_FileIO_Create) |
IPC_MESSAGE_CONTROL2(PpapiHostMsg_FileIO_Open, |
PP_Resource /* file_ref_resource */, |
@@ -1375,7 +1375,7 @@ IPC_MESSAGE_CONTROL0(PpapiHostMsg_FileIO_RequestOSFileHandle) |
IPC_MESSAGE_CONTROL0(PpapiPluginMsg_FileIO_RequestOSFileHandleReply) |
IPC_MESSAGE_CONTROL0(PpapiPluginMsg_FileIO_GeneralReply) |
-// FileSystem |
+// FileSystem ------------------------------------------------------------------ |
IPC_MESSAGE_CONTROL1(PpapiHostMsg_FileSystem_Create, |
PP_FileSystemType /* type */) |
IPC_MESSAGE_CONTROL1(PpapiHostMsg_FileSystem_Open, |
@@ -1393,7 +1393,7 @@ IPC_MESSAGE_CONTROL0(PpapiHostMsg_FlashDRM_GetDeviceID) |
IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FlashDRM_GetDeviceIDReply, |
std::string /* id */) |
-// Gamepad. |
+// Gamepad --------------------------------------------------------------------- |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_Gamepad_Create) |
// Requests that the gamepad host send the shared memory handle to the plugin |
@@ -1405,7 +1405,7 @@ IPC_MESSAGE_CONTROL0(PpapiHostMsg_Gamepad_RequestMemory) |
IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Gamepad_SendMemory) |
-// Graphics2D, plugin -> host |
+// Graphics2D ------------------------------------------------------------------ |
IPC_MESSAGE_CONTROL2(PpapiHostMsg_Graphics2D_Create, |
PP_Size /* size */, |
PP_Bool /* is_always_opaque */) |
@@ -1423,7 +1423,6 @@ IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_ReplaceContents, |
IPC_MESSAGE_CONTROL1(PpapiHostMsg_Graphics2D_Dev_SetScale, |
float /* scale */) |
-// Graphics2D, plugin -> host -> plugin |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_Graphics2D_Flush) |
IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Graphics2D_FlushAck) |
@@ -1432,7 +1431,45 @@ IPC_MESSAGE_CONTROL2(PpapiHostMsg_Graphics2D_ReadImageData, |
PP_Point /* top_left */) |
IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Graphics2D_ReadImageDataAck) |
-// TrueTypeFont. |
+// HostResolverPrivate --------------------------------------------------------- |
yzshen1
2013/06/16 23:49:53
nit, optional: Maybe put the style&order fix in a
dmichael (off chromium)
2013/06/17 21:48:28
Good point, done.
|
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_HostResolverPrivate_Create) |
+IPC_MESSAGE_CONTROL2(PpapiHostMsg_HostResolverPrivate_Resolve, |
+ ppapi::HostPortPair /* host_port */, |
+ PP_HostResolver_Private_Hint /* hint */) |
+IPC_MESSAGE_CONTROL2(PpapiPluginMsg_HostResolverPrivate_ResolveReply, |
+ std::string /* canonical_name */, |
+ std::vector<PP_NetAddress_Private> /* net_address_list */) |
+ |
+// NetworkProxy ---------------------------------------------------------------- |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_NetworkProxy_Create) |
+ |
+// Query the browser for the proxy server to use for the given URL. |
+IPC_MESSAGE_CONTROL1(PpapiHostMsg_NetworkProxy_GetProxyForURL, |
+ std::string /* url */); |
+ |
+// Reply message for GetProxyForURL containing the proxy server. |
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_NetworkProxy_GetProxyForURLReply, |
+ std::string /* proxy */) |
+ |
+// Printing -------------------------------------------------------------------- |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_Create) |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_GetDefaultPrintSettings) |
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Printing_GetDefaultPrintSettingsReply, |
+ PP_PrintSettings_Dev /* print_settings */) |
+ |
+// Shared memory --------------------------------------------------------------- |
+ |
+// Creates shared memory on the host side, returning a handle to the shared |
+// memory on the plugin and keeping the memory mapped in on the host. |
+// We return a "host handle_id" that can be mapped back to the |
+// handle on the host side by PpapiGlobals::UntrackSharedMemoryHandle(). |
+IPC_SYNC_MESSAGE_CONTROL2_2(PpapiHostMsg_SharedMemory_CreateSharedMemory, |
+ PP_Instance /* instance */, |
+ uint32_t /* size */, |
+ int /* host_handle_id */, |
+ ppapi::proxy::SerializedHandle /* plugin_handle */) |
+ |
+// TrueTypeFont ---------------------------------------------------------------- |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_TrueTypeFontSingleton_Create) |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_TrueTypeFontSingleton_GetFontFamilies) |
IPC_MESSAGE_CONTROL1(PpapiPluginMsg_TrueTypeFontSingleton_GetFontFamiliesReply, |
@@ -1457,23 +1494,7 @@ IPC_MESSAGE_CONTROL3(PpapiHostMsg_TrueTypeFont_GetTable, |
IPC_MESSAGE_CONTROL1(PpapiPluginMsg_TrueTypeFont_GetTableReply, |
std::string /* data */) |
-// HostResolverPrivate, plugin -> host -> plugin |
-IPC_MESSAGE_CONTROL0(PpapiHostMsg_HostResolverPrivate_Create) |
-IPC_MESSAGE_CONTROL2(PpapiHostMsg_HostResolverPrivate_Resolve, |
- ppapi::HostPortPair /* host_port */, |
- PP_HostResolver_Private_Hint /* hint */) |
-IPC_MESSAGE_CONTROL2(PpapiPluginMsg_HostResolverPrivate_ResolveReply, |
- std::string /* canonical_name */, |
- std::vector<PP_NetAddress_Private> /* net_address_list */) |
- |
-// Printing. |
-IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_Create) |
-IPC_MESSAGE_CONTROL0(PpapiHostMsg_Printing_GetDefaultPrintSettings) |
-IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Printing_GetDefaultPrintSettingsReply, |
- PP_PrintSettings_Dev /* print_settings */) |
- |
// URLLoader ------------------------------------------------------------------ |
- |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_URLLoader_Create) |
// These messages correspond to PPAPI calls and all should get a |
@@ -1527,20 +1548,7 @@ IPC_MESSAGE_CONTROL4(PpapiPluginMsg_URLLoader_UpdateProgress, |
int64_t /* bytes_received */, |
int64_t /* total_bytes_to_be_received */) |
-// Shared memory --------------------------------------------------------------- |
- |
-// Creates shared memory on the host side, returning a handle to the shared |
-// memory on the plugin and keeping the memory mapped in on the host. |
-// We return a "host handle_id" that can be mapped back to the |
-// handle on the host side by PpapiGlobals::UntrackSharedMemoryHandle(). |
-IPC_SYNC_MESSAGE_CONTROL2_2(PpapiHostMsg_SharedMemory_CreateSharedMemory, |
- PP_Instance /* instance */, |
- uint32_t /* size */, |
- int /* host_handle_id */, |
- ppapi::proxy::SerializedHandle /* plugin_handle */) |
- |
// WebSocket ------------------------------------------------------------------- |
- |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_WebSocket_Create) |
// Establishes the connection to a server. This message requires |
@@ -1621,7 +1629,7 @@ IPC_MESSAGE_CONTROL4(PpapiPluginMsg_WebSocket_ClosedReply, |
#if !defined(OS_NACL) && !defined(NACL_WIN64) |
-// Audio input. |
+// Audio input ---------------------------------------------------------------- |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_AudioInput_Create) |
IPC_MESSAGE_CONTROL3(PpapiHostMsg_AudioInput_Open, |
std::string /* device_id */, |