Revert 172806

ppapi/proxy/ppapi_messages.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Multiply-included message header, no traditional include guard.
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ skipping 1239 matching lines @@
                     ppapi::HostResource /* video_decoder */,
                     int32_t /* picture buffer id */)
 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoDecoder_Flush,
                     ppapi::HostResource /* video_decoder */)
 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoDecoder_Reset,
                     ppapi::HostResource /* video_decoder */)
 IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBVideoDecoder_Destroy,
                            ppapi::HostResource /* video_decoder */)
 
 // PPB_Flash.
+IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBFlash_SetInstanceAlwaysOnTop,
+                    PP_Instance /* instance */,
+                    PP_Bool /* on_top */)
+// This has to be synchronous becuase the caller may want to composite on
+// top of the resulting text after the call is complete.
+IPC_SYNC_MESSAGE_ROUTED2_1(
+    PpapiHostMsg_PPBFlash_DrawGlyphs,
+    PP_Instance /* instance */,
+    ppapi::proxy::PPBFlash_DrawGlyphs_Params /* params */,
+    PP_Bool /* result */)
+IPC_SYNC_MESSAGE_ROUTED4_1(PpapiHostMsg_PPBFlash_Navigate,
+                           PP_Instance /* instance */,
+                           ppapi::URLRequestInfoData /* request_data */,
+                           std::string /* target */,
+                           PP_Bool /* from_user_action */,
+                           int32_t /* result */)
 IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBFlash_GetLocalTimeZoneOffset,
                            PP_Instance /* instance */,
                            PP_Time /* t */,
                            double /* offset */)
+IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBFlash_IsRectTopmost,
+                           PP_Instance /* instance */,
+                           PP_Rect /* rect */,
+                           PP_Bool /* result */)
 IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBFlash_GetSetting,
                            PP_Instance /* instance */,
                            PP_FlashSetting /* setting */,
                            ppapi::proxy::SerializedVar /* result */)
 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBFlash_InvokePrinting,
                     PP_Instance /* instance */)
 
 // PPB_Flash_DeviceID.
 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBFlashDeviceID_Get,
                     int32 /* routing_id */,
@@ skipping 312 matching lines @@
 IPC_MESSAGE_CONTROL1(PpapiHostMsg_AudioInput_StartOrStop, bool /* capture */)
 IPC_MESSAGE_CONTROL0(PpapiHostMsg_AudioInput_Close)
 
 // Flash.
 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Flash_Create)
 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Flash_UpdateActivity)
 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Flash_GetProxyForURL, std::string /* url */)
 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Flash_GetProxyForURLReply,
                      std::string /* proxy */)
 
-// Notifies the renderer whether the Flash instance is in windowed mode. No
-// reply is sent.
-IPC_MESSAGE_CONTROL1(PpapiHostMsg_Flash_SetInstanceAlwaysOnTop,
-                     bool /* on_top */)
-
-// Notifies the renderer to draw text to the given PP_ImageData resource. All
-// parmeters for drawing (including the resource to draw to) are contianed in
-// the PPBFlash_DrawGlyphs_Params structure. An error code is sent in a reply
-// message indicating success.
-IPC_MESSAGE_CONTROL1(PpapiHostMsg_Flash_DrawGlyphs,
-                     ppapi::proxy::PPBFlash_DrawGlyphs_Params /* params */)
-
-// Notifies the renderer to navigate to the given URL contained in the
-// URLRequestInfoData. An error code is sent in a reply message indicating
-// success.
-IPC_MESSAGE_CONTROL3(PpapiHostMsg_Flash_Navigate,
-                     ppapi::URLRequestInfoData /* data */,
-                     std::string /* target */,
-                     bool /* from_user_action */)
-
-// Queries the renderer on whether the plugin instance is the topmost element
-// in the area of the instance specified by the given PP_Rect. PP_OK is sent as
-// the error code in a reply message if the rect is topmost otherwise
-// PP_ERROR_FAILED is sent.
-IPC_MESSAGE_CONTROL1(PpapiHostMsg_Flash_IsRectTopmost,
-                     PP_Rect /* rect */)
-
 // Device enumeration messages used by audio input and video capture.
 IPC_MESSAGE_CONTROL0(PpapiHostMsg_DeviceEnumeration_EnumerateDevices)
 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_DeviceEnumeration_EnumerateDevicesReply,
                      std::vector<ppapi::DeviceRefData> /* devices */)
 IPC_MESSAGE_CONTROL1(PpapiHostMsg_DeviceEnumeration_MonitorDeviceChange,
                      uint32_t /* callback_id */)
 IPC_MESSAGE_CONTROL0(PpapiHostMsg_DeviceEnumeration_StopMonitoringDeviceChange)
 IPC_MESSAGE_CONTROL2(PpapiPluginMsg_DeviceEnumeration_NotifyDeviceChange,
                      uint32_t /* callback_id */,
                      std::vector<ppapi::DeviceRefData> /* devices */)
@@ skipping 102 matching lines @@
                      std::vector<ppapi::HostResource> /* buffers */,
                      uint32_t /* buffer_size */)
 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnStatus,
                      uint32_t /* status */)
 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnError,
                      uint32_t /* error */)
 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnBufferReady,
                      uint32_t /* buffer */)
 
 #endif  // !defined(OS_NACL) && !defined(NACL_WIN64)