Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index eb921d918c2d9f8550ee230b5f81c5db6572c668..a939de89db1c726c680f1bc2e15171c9f09de8f4 100644 |
--- a/ppapi/proxy/ppapi_messages.h |
+++ b/ppapi/proxy/ppapi_messages.h |
@@ -1120,21 +1120,6 @@ IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBNetworkMonitor_Start, |
IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBNetworkMonitor_Stop, |
uint32 /* plugin_dispatcher_id */) |
-#if !defined(OS_NACL) && !defined(NACL_WIN64) |
-// PPB_PDF |
-IPC_SYNC_MESSAGE_ROUTED3_1( |
- PpapiHostMsg_PPBPDF_GetFontFileWithFallback, |
- PP_Instance /* instance */, |
- ppapi::proxy::SerializedFontDescription /* description */, |
- int32_t /* charset */, |
- ppapi::HostResource /* result */) |
-IPC_SYNC_MESSAGE_ROUTED2_1( |
- PpapiHostMsg_PPBPDF_GetFontTableForPrivateFontFile, |
- ppapi::HostResource /* font_file */, |
- uint32_t /* table */, |
- std::string /* result */) |
-#endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
- |
// PPB_Testing. |
IPC_SYNC_MESSAGE_ROUTED3_1( |
PpapiHostMsg_PPBTesting_ReadImageData, |
@@ -1777,10 +1762,13 @@ IPC_MESSAGE_CONTROL2(PpapiHostMsg_PDF_GetResourceImage, |
// Reply for PpapiHostMsg_PDF_GetResourceImage containing the host resource id |
// of the image and a string (representing a PP_ImageDataDesc) containing the |
// properties of the image. Also carries a shared memory handle pointing to the |
-// memory containg the image. |
-IPC_MESSAGE_CONTROL2(PpapiPluginMsg_PDF_GetResourceImageReply, |
+// memory containg the image. On linux, the handle is transmitted in this |
+// message as |fd|. This is due to the unfortunate way that ImageHandles are |
yzshen1
2013/04/03 18:32:39
Does it make sense to have a TODO to make Serializ
raymes
2013/04/03 23:18:21
Done. I put it in serialized_structs.h
|
+// defined for use with PPB_ImageData. |
+IPC_MESSAGE_CONTROL3(PpapiPluginMsg_PDF_GetResourceImageReply, |
ppapi::HostResource /* resource_id */, |
- std::string /* image_data_desc */) |
+ std::string /* image_data_desc */, |
+ int /* fd */) |
// VideoCapture_Dev, plugin -> host |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_VideoCapture_Create) |