Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index b5e04de4a03d4edac23120e44a108e553f0d8856..560e5e32fdb3355fc88408ed183bf04d812dbaae 100644 |
--- a/ppapi/proxy/ppapi_messages.h |
+++ b/ppapi/proxy/ppapi_messages.h |
@@ -562,10 +562,10 @@ IPC_MESSAGE_ROUTED3(PpapiMsg_PPPInstance_DidChangeView, |
IPC_MESSAGE_ROUTED2(PpapiMsg_PPPInstance_DidChangeFocus, |
PP_Instance /* instance */, |
PP_Bool /* has_focus */) |
-IPC_SYNC_MESSAGE_ROUTED2_1(PpapiMsg_PPPInstance_HandleDocumentLoad, |
- PP_Instance /* instance */, |
- ppapi::HostResource /* url_loader */, |
- PP_Bool /* result */) |
+IPC_MESSAGE_ROUTED3(PpapiMsg_PPPInstance_HandleDocumentLoad, |
+ PP_Instance /* instance */, |
+ int /* pending_loader_host_id */, |
+ ppapi::URLResponseInfoData /* response */) |
// PPP_Messaging. |
IPC_MESSAGE_ROUTED2(PpapiMsg_PPPMessaging_HandleMessage, |
@@ -1505,7 +1505,63 @@ 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 |
+// CallbackComplete message. |
+IPC_MESSAGE_CONTROL1(PpapiHostMsg_URLLoader_Open, |
+ ppapi::URLRequestInfoData /* request_data */) |
+ |
+// The plugin can tell the host to defer a load to hold off on sending more |
+// data because the buffer in the plugin is full. When defers_loading is set to |
+// false, data streaming will resume. |
+// |
+// When auditing redirects (no auto follow) the load will be automatically |
+// deferred each time we get a redirect. The plugin will reset this to false |
+// by sending this message when it wants to continue following the redirect. |
+// |
+// When streaming data, the host may still send more data after this call (for |
+// example, it could already be in-flight at the time of this request). |
+IPC_MESSAGE_CONTROL1(PpapiHostMsg_URLLoader_SetDeferLoading, |
+ bool /* defers_loading */) |
+ |
+// Closes the URLLoader. There is no reply. |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_URLLoader_Close) |
+ |
+// Requests that cross-site restrictions be ignored. The plugin must have |
+// the private permission set. Otherwise this message will be ignored by the |
+// renderer. There is no reply. |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_URLLoader_GrantUniversalAccess) |
+ |
+// Push notification that a response is available. |
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_URLLoader_ReceivedResponse, |
+ ppapi::URLResponseInfoData /* response */) |
+ |
+// Push notification with load data from the renderer. It is a custom generated |
+// message with the response data (array of bytes stored via WriteData) |
+// appended. |
+IPC_MESSAGE_CONTROL0(PpapiPluginMsg_URLLoader_SendData) |
+ |
+// Push notification indicating that all data has been sent, either via |
+// SendData or by streaming it to a file. Note that since this is a push |
+// notification, we don't use the result field of the ResourceMessageReply. |
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_URLLoader_FinishedLoading, |
+ int32_t /* result */) |
+ |
+// Push notification from the renderer to the plugin to tell it about download |
+// and upload progress. This will only be sent if the plugin has requested |
+// progress updates, and only the fields requested by the plugin will be |
+// valid. |
+IPC_MESSAGE_CONTROL4(PpapiPluginMsg_URLLoader_UpdateProgress, |
+ int64_t /* bytes_sent */, |
+ int64_t /* total_bytes_to_be_sent */, |
+ int64_t /* bytes_received */, |
+ int64_t /* total_bytes_to_be_received */) |
+ |
// WebSocket ------------------------------------------------------------------ |
+ |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_WebSocket_Create) |
// Establishes the connection to a server. This message requires |