Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index b6931cc7949f1456afb8f5b9fcc7e2c54332e2d8..3aef7ff6ffe690c639e009da59b92da1d968dfe0 100644 |
--- a/ppapi/proxy/ppapi_messages.h |
+++ b/ppapi/proxy/ppapi_messages.h |
@@ -965,8 +965,6 @@ IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBInstance_ExecuteScript, |
IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBInstance_GetDefaultCharSet, |
PP_Instance /* instance */, |
ppapi::proxy::SerializedVar /* result */) |
-IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBInstance_GetFontFamilies, |
- std::string /* result */) |
IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBInstance_SetFullscreen, |
PP_Instance /* instance */, |
PP_Bool /* fullscreen */, |
@@ -1365,13 +1363,6 @@ IPC_SYNC_MESSAGE_CONTROL1_2(PpapiHostMsg_PPBX509Certificate_ParseDER, |
bool /* succeeded */, |
ppapi::PPB_X509Certificate_Fields /* result */) |
-#if !defined(OS_NACL) && !defined(NACL_WIN64) |
-// PPB_Font. |
-IPC_SYNC_MESSAGE_CONTROL0_1(PpapiHostMsg_PPBFont_GetFontFamilies, |
- std::string /* result */) |
- |
-#endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
- |
//----------------------------------------------------------------------------- |
// Resource call/reply messages. |
// |
@@ -1594,7 +1585,21 @@ IPC_MESSAGE_CONTROL0(PpapiPluginMsg_AudioInput_OpenReply) |
IPC_MESSAGE_CONTROL1(PpapiHostMsg_AudioInput_StartOrStop, bool /* capture */) |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_AudioInput_Close) |
-// Flash. |
+// BrowserFont ----------------------------------------------------------------- |
+ |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_BrowserFontSingleton_Create) |
+ |
+// Requests that the browser reply with the list of font families via |
+// PpapiPluginMsg_BrowserFontSingleton_GetFontFamiliesReply. |
+IPC_MESSAGE_CONTROL0(PpapiHostMsg_BrowserFontSingleton_GetFontFamilies) |
+ |
+// Reply to PpapiHostMsg_BrowserFontSingleton_GetFontFamilies with the font |
+// family list. |
raymes
2012/12/17 00:08:29
nit: maybe add a note that it is encoded as a null
|
+IPC_MESSAGE_CONTROL1(PpapiPluginMsg_BrowserFontSingleton_GetFontFamiliesReply, |
+ std::string /* families */) |
+ |
+// Flash ----------------------------------------------------------------------- |
+ |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_Flash_Create) |
IPC_MESSAGE_CONTROL0(PpapiHostMsg_Flash_UpdateActivity) |
IPC_MESSAGE_CONTROL1(PpapiHostMsg_Flash_GetProxyForURL, std::string /* url */) |