Merge 22369 - Fix plugin IPC issues....

chrome/common/plugin_messages_internal.h

 // Copyright (c) 2009 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.
 
 #include "base/gfx/native_widget_types.h"
 #include "base/shared_memory.h"
 #include "build/build_config.h"
 #include "ipc/ipc_message_macros.h"
 #include "webkit/glue/webcursor.h"
 
@@ skipping 165 matching lines @@
 
   IPC_SYNC_MESSAGE_ROUTED1_2(PluginMsg_HandleInputEvent,
                              IPC::WebInputEventPointer /* event */,
                              bool /* handled */,
                              WebCursor /* cursor type*/)
 
   IPC_SYNC_MESSAGE_ROUTED2_0(PluginMsg_WillSendRequest,
                              int /* id */,
                              GURL /* url */)
 
-  IPC_SYNC_MESSAGE_ROUTED1_1(PluginMsg_DidReceiveResponse,
-                             PluginMsg_DidReceiveResponseParams,
-                             bool /* cancel */)
+  IPC_MESSAGE_ROUTED1(PluginMsg_DidReceiveResponse,
+                      PluginMsg_DidReceiveResponseParams)
 
-  IPC_SYNC_MESSAGE_ROUTED3_0(PluginMsg_DidReceiveData,
-                             int /* id */,
-                             std::vector<char> /* buffer */,
-                             int /* data_offset */)
+  IPC_MESSAGE_ROUTED3(PluginMsg_DidReceiveData,
+                      int /* id */,
+                      std::vector<char> /* buffer */,
+                      int /* data_offset */)
 
-  IPC_SYNC_MESSAGE_ROUTED1_0(PluginMsg_DidFinishLoading,
-                             int /* id */)
+  IPC_MESSAGE_ROUTED1(PluginMsg_DidFinishLoading,
+                      int /* id */)
 
-  IPC_SYNC_MESSAGE_ROUTED1_0(PluginMsg_DidFail,
-                             int /* id */)
+  IPC_MESSAGE_ROUTED1(PluginMsg_DidFail,
+                      int /* id */)
 
   IPC_MESSAGE_ROUTED5(PluginMsg_SendJavaScriptStream,
                       std::string /* url */,
                       std::wstring /* result */,
                       bool /* success */,
                       bool /* notify required */,
                       intptr_t /* notify data */)
 
   IPC_MESSAGE_ROUTED2(PluginMsg_DidReceiveManualResponse,
                       std::string /* url */,
@@ skipping 105 matching lines @@
 
   IPC_MESSAGE_ROUTED0(PluginHostMsg_CancelDocumentLoad)
 
   IPC_MESSAGE_ROUTED5(PluginHostMsg_InitiateHTTPRangeRequest,
                       std::string /* url */,
                       std::string /* range_info */,
                       intptr_t    /* existing_stream */,
                       bool        /* notify_needed */,
                       intptr_t    /* notify_data */)
 
+  IPC_MESSAGE_ROUTED2(PluginHostMsg_DeferResourceLoading,
+                      int  /* resource_id */,
+                      bool /* defer */)
+
 IPC_END_MESSAGES(PluginHost)
 
 //-----------------------------------------------------------------------------
 // NPObject messages
 // These are messages used to marshall NPObjects.  They are sent both from the
 // plugin to the renderer and from the renderer to the plugin.
 IPC_BEGIN_MESSAGES(NPObject)
   IPC_SYNC_MESSAGE_ROUTED0_0(NPObjectMsg_Release)
 
   IPC_SYNC_MESSAGE_ROUTED1_1(NPObjectMsg_HasMethod,
@@ skipping 39 matching lines @@
   IPC_SYNC_MESSAGE_ROUTED2_2(NPObjectMsg_Evaluate,
                              std::string /* script */,
                              bool /* popups_allowed */,
                              NPVariant_Param /* result_param */,
                              bool /* result */)
 
   IPC_SYNC_MESSAGE_ROUTED1_0(NPObjectMsg_SetException,
                              std::string /* message */)
 
 IPC_END_MESSAGES(NPObject)