Merge 22369 - Fix plugin IPC issues....

chrome/renderer/webplugin_delegate_proxy.cc

Index: chrome/renderer/webplugin_delegate_proxy.cc
===================================================================
--- chrome/renderer/webplugin_delegate_proxy.cc	(revision 23177)
+++ chrome/renderer/webplugin_delegate_proxy.cc	(working copy)
@@ -97,8 +97,7 @@
                           const std::string& headers,
                           uint32 expected_length,
                           uint32 last_modified,
-                          bool request_is_seekable,
-                          bool* cancel) {
+                          bool request_is_seekable) {
     DCHECK(channel_ != NULL);
     PluginMsg_DidReceiveResponseParams params;
     params.id = resource_id_;
@@ -110,8 +109,7 @@
     // Grab a reference on the underlying channel so it does not get
     // deleted from under us.
     scoped_refptr<PluginChannelHost> channel_ref(channel_);
-    channel_->Send(new PluginMsg_DidReceiveResponse(instance_id_, params,
-                                                    cancel));
+    channel_->Send(new PluginMsg_DidReceiveResponse(instance_id_, params));
   }
 
   void DidReceiveData(const char* buffer, int length, int data_offset) {
@@ -379,6 +377,8 @@
     IPC_MESSAGE_HANDLER(PluginHostMsg_CancelDocumentLoad, OnCancelDocumentLoad)
     IPC_MESSAGE_HANDLER(PluginHostMsg_InitiateHTTPRangeRequest,
                         OnInitiateHTTPRangeRequest)
+    IPC_MESSAGE_HANDLER(PluginHostMsg_DeferResourceLoading,
+                        OnDeferResourceLoading)
     IPC_MESSAGE_UNHANDLED_ERROR()
   IPC_END_MESSAGE_MAP()
 }
@@ -1018,3 +1018,8 @@
                                     existing_stream, notify_needed,
                                     notify_data);
 }
+
+void WebPluginDelegateProxy::OnDeferResourceLoading(int resource_id,
+                                                    bool defer) {
+  plugin_->SetDeferResourceLoading(resource_id, defer);
+}
Property changes on: chrome\renderer\webplugin_delegate_proxy.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/renderer/webplugin_delegate_proxy.cc:r22369